diff options
| author | Jeremy Joslin <jjoslin@google.com> | 2017-01-11 19:59:27 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-01-11 19:59:27 +0000 |
| commit | ab9eb11e2f960346b8eeb52587431ca3cf3f3aaf (patch) | |
| tree | 902d8e6a1eeac861d3c58a6b2689ce1a654c9220 /core/java/android | |
| parent | d999e534873606b93626cf8e76201c018272b893 (diff) | |
| parent | 425a0fdc95f2f3105ab2677a7fb469d5b19d8a78 (diff) | |
Merge "Move getActiveScorerPackage() to the score service." am: b5488ec3b3
am: 425a0fdc95
Change-Id: Icd1e76d7987cc9937cce5079dedf610fcd21c903
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/net/INetworkScoreService.aidl | 8 | ||||
| -rw-r--r-- | core/java/android/net/NetworkScoreManager.java | 8 |
2 files changed, 12 insertions, 4 deletions
diff --git a/core/java/android/net/INetworkScoreService.aidl b/core/java/android/net/INetworkScoreService.aidl index b097f12d460e..9573953e6e13 100644 --- a/core/java/android/net/INetworkScoreService.aidl +++ b/core/java/android/net/INetworkScoreService.aidl @@ -109,4 +109,12 @@ interface INetworkScoreService * @hide */ boolean isCallerActiveScorer(int callingUid); + + /** + * Obtain the package name of the current active network scorer. + * + * @return the full package name of the current active scorer, or null if there is no active + * scorer. + */ + String getActiveScorerPackage(); } diff --git a/core/java/android/net/NetworkScoreManager.java b/core/java/android/net/NetworkScoreManager.java index af0306e35aaa..a6854dcb8eb3 100644 --- a/core/java/android/net/NetworkScoreManager.java +++ b/core/java/android/net/NetworkScoreManager.java @@ -170,11 +170,11 @@ public class NetworkScoreManager { * scorer. */ public String getActiveScorerPackage() { - NetworkScorerAppData app = new NetworkScorerAppManager(mContext).getActiveScorer(); - if (app == null) { - return null; + try { + return mService.getActiveScorerPackage(); + } catch (RemoteException e) { + throw e.rethrowFromSystemServer(); } - return app.packageName; } /** |