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

Merge "notifyCarrierNetworkChange with subId"

Browse Source
This commit is contained in:
Chen Xu
2019-03-26 04:20:52 +00:00
committed by Android (Google) Code Review
parent a6603357c8 5b98d401a0
commit 2f662e6477
3 changed files with 33 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/java/android/service/carrier/CarrierService.java
View File

@@ -114,9 +114,7 @@ public abstract class CarrierService extends Service {
* this UX, so a carrier app must be sure to call with active set to false
* sometime after calling with it set to true.
* <p>
* Requires Permission:
* {@link android.Manifest.permission#MODIFY_PHONE_STATE MODIFY_PHONE_STATE}
* or the calling app has carrier privileges.
* Requires Permission: calling app has carrier privileges.
*
* @param active Whether the carrier network change is or shortly will be
* active. Set this value to true to begin showing

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

@@ -73,10 +73,12 @@ import com.android.server.am.BatteryStatsService;
import java.io.FileDescriptor;
import java.io.PrintWriter;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.NoSuchElementException;
import java.util.OptionalInt;
/**
* Since phone process can be restarted, this class provides a centralized place
@@ -1159,17 +1161,28 @@ public class TelephonyRegistry extends ITelephonyRegistry.Stub {
@Override
public void notifyCarrierNetworkChange(boolean active) {
enforceNotifyPermissionOrCarrierPrivilege("notifyCarrierNetworkChange()");
// only CarrierService with carrier privilege rule should have the permission.
int subId = SubscriptionManager.INVALID_SUBSCRIPTION_ID;
try {
subId = Arrays.stream(SubscriptionManager.from(mContext)
.getActiveSubscriptionIdList())
.filter(i -> TelephonyPermissions.checkCarrierPrivilegeForSubId(i))
.findFirst().getAsInt();
} catch (NoSuchElementException ex) {
log("notifyCarrierNetworkChange without carrier privilege");
}
int phoneId = SubscriptionManager.getPhoneId(subId);
if (VDBG) {
log("notifyCarrierNetworkChange: active=" + active);
log("notifyCarrierNetworkChange: active=" + active + "subId: " + subId);
}
synchronized (mRecords) {
mCarrierNetworkChangeState = active;
for (Record r : mRecords) {
if (r.matchPhoneStateListenerEvent(
PhoneStateListener.LISTEN_CARRIER_NETWORK_CHANGE)) {
PhoneStateListener.LISTEN_CARRIER_NETWORK_CHANGE) &&
idMatch(r.subId, subId, phoneId)) {
try {
r.callback.onCarrierNetworkChange(active);
} catch (RemoteException ex) {

25
telephony/java/com/android/internal/telephony/TelephonyPermissions.java
View File

@@ -123,6 +123,19 @@ public final class TelephonyPermissions {
context, TELEPHONY_SUPPLIER, subId, pid, uid, callingPackage, message);
}
/**
* Check whether the calling packages has carrier privileges for the passing subscription.
* @return {@code true} if the caller has carrier privileges, {@false} otherwise.
*/
public static boolean checkCarrierPrivilegeForSubId(int subId) {
if (SubscriptionManager.isValidSubscriptionId(subId)
&& getCarrierPrivilegeStatus(TELEPHONY_SUPPLIER, subId, Binder.getCallingUid())
== TelephonyManager.CARRIER_PRIVILEGE_STATUS_HAS_ACCESS) {
return true;
}
return false;
}
@VisibleForTesting
public static boolean checkReadPhoneState(
Context context, Supplier<ITelephony> telephonySupplier, int subId, int pid, int uid,
@@ -204,9 +217,7 @@ public final class TelephonyPermissions {
}
// Calling packages with carrier privileges will also have access to device identifiers, but
// this may be removed in a future release.
if (SubscriptionManager.isValidSubscriptionId(subId) && getCarrierPrivilegeStatus(
TELEPHONY_SUPPLIER, subId, uid)
== TelephonyManager.CARRIER_PRIVILEGE_STATUS_HAS_ACCESS) {
if (checkCarrierPrivilegeForSubId(subId)) {
return true;
}
// else the calling package is not authorized to access the device identifiers; call
@@ -243,9 +254,7 @@ public final class TelephonyPermissions {
}
// If the calling package has carrier privileges then allow access to the subscriber
// identifiers.
if (SubscriptionManager.isValidSubscriptionId(subId) && getCarrierPrivilegeStatus(
TELEPHONY_SUPPLIER, subId, uid)
== TelephonyManager.CARRIER_PRIVILEGE_STATUS_HAS_ACCESS) {
if (checkCarrierPrivilegeForSubId(subId)) {
return true;
}
return reportAccessDeniedToReadIdentifiers(context, subId, pid, uid, callingPackage,
@@ -365,9 +374,7 @@ public final class TelephonyPermissions {
uid) == PackageManager.PERMISSION_GRANTED) {
return false;
}
if (SubscriptionManager.isValidSubscriptionId(subId)
&& getCarrierPrivilegeStatus(TELEPHONY_SUPPLIER, subId, uid)
== TelephonyManager.CARRIER_PRIVILEGE_STATUS_HAS_ACCESS) {
if (checkCarrierPrivilegeForSubId(subId)) {
return false;
}
}