summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> 2023-12-01 11:47:24 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-12-01 11:47:24 +0000
commit1fa6b44ddbfaa150b7bcbb986d66c841fc596d41 (patch)
tree080abdc9f84cdfbc1870091a41c622e71327af19
parent4d5d516930497868d06256d34bfff2b35d430631 (diff)
parentc30dff8f85b6e365fb1b281daad75014265ee53f (diff)
Merge "MediaCas : replace getService() with waitForDeclaredService()" into main am: c30dff8f85
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2852026 Change-Id: I40e9e9364608c15466b089556bc26cf8d9f47a41 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--media/java/android/media/MediaCas.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/media/java/android/media/MediaCas.java b/media/java/android/media/MediaCas.java
index 0a0a6263686a..ab7c27f70e05 100644
--- a/media/java/android/media/MediaCas.java
+++ b/media/java/android/media/MediaCas.java
@@ -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;