diff --git a/core/java/android/os/ServiceManager.java b/core/java/android/os/ServiceManager.java index 13b8b66306e1f..2ba4aa433713e 100644 --- a/core/java/android/os/ServiceManager.java +++ b/core/java/android/os/ServiceManager.java @@ -112,8 +112,10 @@ public final class ServiceManager { /** * Return a list of all currently running services. + * @return an array of all currently running services, or null in + * case of an exception */ - public static String[] listServices() throws RemoteException { + public static String[] listServices() { try { return getIServiceManager().listServices(); } catch (RemoteException e) { diff --git a/tools/layoutlib/bridge/src/android/os/ServiceManager.java b/tools/layoutlib/bridge/src/android/os/ServiceManager.java index 6a68ee29c9cb1..549074d157576 100644 --- a/tools/layoutlib/bridge/src/android/os/ServiceManager.java +++ b/tools/layoutlib/bridge/src/android/os/ServiceManager.java @@ -51,8 +51,10 @@ public final class ServiceManager { /** * Return a list of all currently running services. + * @return an array of all currently running services, or null in + * case of an exception */ - public static String[] listServices() throws RemoteException { + public static String[] listServices() { // actual implementation returns null sometimes, so it's ok // to return null instead of an empty list. return null;