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

Commit dd7204ab authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Change resource claim to sync to avoid resource conflict" am: f8d76455 am: 7155480d 

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If829fdf572306852ce0fda685cfb620836f87298
parents 1ee34508 7155480d

media/java/android/media/tv/tuner/Tuner.java

+1 −1
Original line number Diff line number Diff line
@@ -241,6 +241,7 @@ public class Tuner implements AutoCloseable { 
                                .write(FrameworkStatsLog.TV_TUNER_STATE_CHANGED, mUserId,

                                    FrameworkStatsLog.TV_TUNER_STATE_CHANGED__STATE__UNKNOWN);

                    }

                    releaseAll();

                    mHandler.sendMessage(mHandler.obtainMessage(MSG_RESOURCE_LOST));

                }

            };
@@ -511,7 +512,6 @@ public class Tuner implements AutoCloseable { 
                    break;

                }

                case MSG_RESOURCE_LOST: {

                    releaseAll();

                    if (mOnResourceLostListener != null

                                && mOnResourceLostListenerExecutor != null) {

                        mOnResourceLostListenerExecutor.execute(