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

Merge "Fix NetworkScoreService#getActiveScorer." into rvc-dev am: ea920f597d am: 833823dc40

Browse Source 
Change-Id: Ied99e91b45f9e7dbf897a534b5dceec49725a78c
This commit is contained in:
Varun Anand
2020-03-19 21:51:50 +00:00
committed by Automerger Merge Worker
parent fe2602e53d 833823dc40
commit 8844a10d28
1 changed files with 5 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
services/core/java/com/android/server/NetworkScoreService.java
View File

@@ -760,13 +760,12 @@ public class NetworkScoreService extends INetworkScoreService.Stub {
@Override @Override
public String getActiveScorerPackage() { public String getActiveScorerPackage() {
enforceSystemOrHasScoreNetworks(); enforceSystemOrHasScoreNetworks();
synchronized (mServiceConnectionLock) { NetworkScorerAppData appData = mNetworkScorerAppManager.getActiveScorer();
if (mServiceConnection != null) { if (appData == null) {
return mServiceConnection.getPackageName();
}
}
return null; return null;
} }
return appData.getRecommendationServicePackageName();
}
/** /**
* Returns metadata about the active scorer or <code>null</code> if there is no active scorer. * Returns metadata about the active scorer or <code>null</code> if there is no active scorer.
@@ -775,13 +774,7 @@ public class NetworkScoreService extends INetworkScoreService.Stub {
public NetworkScorerAppData getActiveScorer() { public NetworkScorerAppData getActiveScorer() {
// Only the system can access this data. // Only the system can access this data.
enforceSystemOnly(); enforceSystemOnly();
synchronized (mServiceConnectionLock) { return mNetworkScorerAppManager.getActiveScorer();
if (mServiceConnection != null) {
return mServiceConnection.getAppData();
}
}
return null;
} }
/** /**