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

Merge "throw securityexception for notifyNetworkChange" into qt-dev

Browse Source 
am: d81cd26296

Change-Id: Iaaa2db8cf6a65c540dc4e09f3a4761f123b87081
This commit is contained in:
Chen Xu
2019-04-11 09:40:16 -07:00
committed by android-build-merger
parent 897f3f447f d81cd26296
commit ccc155ea51
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
services/core/java/com/android/server/TelephonyRegistry.java
View File

@@ -1172,7 +1172,11 @@ public class TelephonyRegistry extends ITelephonyRegistry.Stub {
.filter(i -> TelephonyPermissions.checkCarrierPrivilegeForSubId(i)) .filter(i -> TelephonyPermissions.checkCarrierPrivilegeForSubId(i))
.findFirst().getAsInt(); .findFirst().getAsInt();
} catch (NoSuchElementException ex) { } catch (NoSuchElementException ex) {
log("notifyCarrierNetworkChange without carrier privilege"); loge("notifyCarrierNetworkChange without carrier privilege");
}
// the active subId does not have carrier privilege.
if (subId == SubscriptionManager.INVALID_SUBSCRIPTION_ID) {
throw new SecurityException("notifyCarrierNetworkChange without carrier privilege");
} }
int phoneId = SubscriptionManager.getPhoneId(subId); int phoneId = SubscriptionManager.getPhoneId(subId);
@@ -2272,6 +2276,10 @@ public class TelephonyRegistry extends ITelephonyRegistry.Stub {
Rlog.d(TAG, s); Rlog.d(TAG, s);
} }
private static void loge(String s) {
Rlog.e(TAG, s);
}
boolean idMatch(int rSubId, int subId, int phoneId) { boolean idMatch(int rSubId, int subId, int phoneId) {
if(subId < 0) { if(subId < 0) {