drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix NetworkScorerAppManager#isCallerActiveScorer."

Browse Source 
am: 48eecdcbc4

Change-Id: I6b9ecd35dbc0758cd45b804dc9586287428af293
This commit is contained in:
Amin Shaikh
2017-01-06 00:08:19 +00:00
committed by android-build-merger
parent 161d1487ba 48eecdcbc4
commit 7495cf633c
2 changed files with 20 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/java/android/net/NetworkScorerAppManager.java
View File

@ -231,13 +231,7 @@ public class NetworkScorerAppManager {
if (defaultApp == null) { if (defaultApp == null) {
return false; return false;
} }
if (callingUid != defaultApp.packageUid) { return callingUid == defaultApp.packageUid;
return false;
}
// To be extra safe, ensure the caller holds the SCORE_NETWORKS permission. It always
// should, since it couldn't become the active scorer otherwise, but this can't hurt.
return mContext.checkCallingPermission(Manifest.permission.SCORE_NETWORKS) ==
PackageManager.PERMISSION_GRANTED;
} }
private boolean isNetworkRecommendationsDisabled() { private boolean isNetworkRecommendationsDisabled() {

19
core/tests/coretests/src/android/net/NetworkScorerAppManagerTest.java
View File

@ -169,6 +169,25 @@ public class NetworkScorerAppManagerTest extends InstrumentationTestCase {
assertNull(activeScorer); assertNull(activeScorer);
} }
public void testIsCallerActiveScorer_providerNotAvailable() throws Exception {
ContentResolver cr = mTargetContext.getContentResolver();
Settings.Global.putInt(cr, Settings.Global.NETWORK_RECOMMENDATIONS_ENABLED, 1);
assertFalse(mNetworkScorerAppManager.isCallerActiveScorer(924));
}
public void testIsCallerActiveScorer_providerAvailable() throws Exception {
setNetworkRecommendationPackageNames("package1");
mockScoreNetworksGranted("package1");
mockRecommendationServiceAvailable("package1", 924 /* packageUid */);
ContentResolver cr = mTargetContext.getContentResolver();
Settings.Global.putInt(cr, Settings.Global.NETWORK_RECOMMENDATIONS_ENABLED, 1);
assertTrue(mNetworkScorerAppManager.isCallerActiveScorer(924));
assertFalse(mNetworkScorerAppManager.isCallerActiveScorer(925));
}
private void setNetworkRecommendationPackageNames(String... names) { private void setNetworkRecommendationPackageNames(String... names) {
if (names == null) { if (names == null) {
names = new String[0]; names = new String[0];