Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7baa8b4e authored by Shubang Lu's avatar Shubang Lu Committed by Automerger Merge Worker
Browse files

Merge "[TIAF] Fix a bug about recording ID when schedule recording" into... 

Merge "[TIAF] Fix a bug about recording ID when schedule recording" into udc-dev am: 215a1e79 am: 69ffc833

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22213852



Change-Id: Iacea2b6b57fd8fe785eb3cd14ab384cdafe2f728
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 016050fa 69ffc833

services/core/java/com/android/server/tv/interactive/TvInteractiveAppManagerService.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -2887,7 +2887,7 @@ public class TvInteractiveAppManagerService extends SystemService { 
        }

        }





        @Override

        @Override

        public void onRequestScheduleRecording2(String inputId, String requestId, Uri channelUri,

        public void onRequestScheduleRecording2(String requestId, String inputId, Uri channelUri,

                long start, long duration, int repeat, Bundle params) {

                long start, long duration, int repeat, Bundle params) {

            synchronized (mLock) {

            synchronized (mLock) {

                if (DEBUG) {

                if (DEBUG) {