diff options
| author | Hari Raj Vijayakumar <Hariraj.vijayakumar@vantiva.net> | 2023-02-10 14:43:07 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-02-10 14:43:07 +0000 |
| commit | 7e99006982707bd7efe237e8b0e73f44f2e2c394 (patch) | |
| tree | ba54c0dd8987c6d2c3a2e4c4362bc4ce896f9edd /src/com/android | |
| parent | c2c77f6498fee0d8b5d581cbc5c7f4fa7d63f9a6 (diff) | |
| parent | 3242afd934bebbe3c2ad745259fb9c484420acc5 (diff) | |
| download | TV-7e99006982707bd7efe237e8b0e73f44f2e2c394.tar.gz | |
Remove hardcoded SDK version in manifest to fix GTS failure am: 0437ab8af1 am: 4f2f655f60 am: 3242afd934
Original change: https://android-review.googlesource.com/c/platform/packages/apps/TV/+/2429812
Change-Id: Ibe9da424ca0b0e7108a7eb5077ecf454c6c82e72
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'src/com/android')
| -rw-r--r-- | src/com/android/tv/MainActivity.java | 4 | ||||
| -rw-r--r-- | src/com/android/tv/dvr/recorder/RecordingScheduler.java | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/src/com/android/tv/MainActivity.java b/src/com/android/tv/MainActivity.java index 1f2fd027..cb731260 100644 --- a/src/com/android/tv/MainActivity.java +++ b/src/com/android/tv/MainActivity.java @@ -726,8 +726,8 @@ public class MainActivity extends Activity mAudioCapabilitiesReceiver = new AudioCapabilitiesReceiver(this, null); mAudioCapabilitiesReceiver.register(); Intent nowPlayingIntent = new Intent(this, MainActivity.class); - PendingIntent pendingIntent = - PendingIntent.getActivity(this, REQUEST_CODE_NOW_PLAYING, nowPlayingIntent, 0); + PendingIntent pendingIntent = PendingIntent.getActivity(this, REQUEST_CODE_NOW_PLAYING, + nowPlayingIntent, PendingIntent.FLAG_IMMUTABLE); mMediaSessionWrapper = new MediaSessionWrapper(this, pendingIntent); mTvViewUiManager.restoreDisplayMode(false); diff --git a/src/com/android/tv/dvr/recorder/RecordingScheduler.java b/src/com/android/tv/dvr/recorder/RecordingScheduler.java index f309537d..475c17f8 100644 --- a/src/com/android/tv/dvr/recorder/RecordingScheduler.java +++ b/src/com/android/tv/dvr/recorder/RecordingScheduler.java @@ -322,7 +322,8 @@ public class RecordingScheduler extends TvInputCallback implements ScheduledReco long wakeAt = nextStartTime - MS_TO_WAKE_BEFORE_START; if (DEBUG) Log.d(TAG, "Set alarm to record at " + wakeAt); Intent intent = new Intent(mContext, DvrStartRecordingReceiver.class); - PendingIntent alarmIntent = PendingIntent.getBroadcast(mContext, 0, intent, 0); + PendingIntent alarmIntent = + PendingIntent.getBroadcast(mContext, 0, intent, PendingIntent.FLAG_IMMUTABLE); // This will cancel the previous alarm. mAlarmManager.setExactAndAllowWhileIdle(AlarmManager.RTC_WAKEUP, wakeAt, alarmIntent); } else { |