Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "[1/3] Remove unnecessary throws statement in ServiceManager"

Browse Source 
am: d1240219aa

* commit 'd1240219aadedc867b50158c67d1737a27fa7c6f':
  [1/3] Remove unnecessary throws statement in ServiceManager
This commit is contained in:
Alex Klyubin
2016-01-07 19:18:01 +00:00
committed by android-build-merger
parent 2c8f42d730 d1240219aa
commit 4a06b7ea7e
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/java/android/os/ServiceManager.java
View File

@@ -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 <code>null</code> in
* case of an exception
*/
public static String[] listServices() throws RemoteException {
public static String[] listServices() {
try {
return getIServiceManager().listServices();
} catch (RemoteException e) {

4
tools/layoutlib/bridge/src/android/os/ServiceManager.java
View File

@@ -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 <code>null</code> 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;