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

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

Merge "Add comment for thrown exception in waitForDeclaredService" am:... 

Merge "Add comment for thrown exception in waitForDeclaredService" am: 4f96be15 am: 9473b54e am: 2c6b635e

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



Change-Id: Idda242e2c820b0d832dc430dbb6d52aea5154fd5
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents d470a7d0 2c6b635e

core/java/android/os/ServiceManager.java

+4 −2
Original line number Diff line number Diff line
@@ -292,8 +292,10 @@ public final class ServiceManager { 
     * If the service is not running, servicemanager will attempt to start it, and this function

     * will wait for it to be ready.

     *

     * @return {@code null} if the service is not declared in the manifest, or if there are

     * permission problems, or if there are fatal errors.

     * @throws SecurityException if the process does not have the permissions to check

     * isDeclared() for the service.

     * @return {@code null} if the service is not declared in the manifest, or if there

     * are fatal errors.

     * @hide

     */

    @SystemApi(client = SystemApi.Client.MODULE_LIBRARIES)