summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> 2023-12-01 11:47:16 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-12-01 11:47:16 +0000
commit20dfff6f961bb97bf51cbb0a8a412897d5ea62fd (patch)
treec9431d0bf62e9eb1475c5e2c6a8c04343cb1a1bf
parentf85e1f83ccb68f788b0cb6e7be71a9409e096fad (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: Ib95a7e8884dfe053c58606c8323c4823c10ed97d 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;