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

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

Merge "MediaCas : replace getService() with waitForDeclaredService()" into... 

Merge "MediaCas : replace getService() with waitForDeclaredService()" into main am: c30dff8f am: 20dfff6f am: e11fb321

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



Change-Id: I4d74dc0236ec29735aafa233494f573def433ff9
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 1987dead e11fb321

media/java/android/media/MediaCas.java

+1 −1
Original line number Diff line number Diff line
@@ -272,7 +272,7 @@ public final class MediaCas implements AutoCloseable { 
                        Log.d(TAG, "Trying to get AIDL service");

                        IMediaCasService serviceAidl =

                                IMediaCasService.Stub.asInterface(

                                        ServiceManager.getService(

                                        ServiceManager.waitForDeclaredService(

                                                IMediaCasService.DESCRIPTOR + "/default"));

                        if (serviceAidl != null) {

                            return serviceAidl;