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

Merge "Make getPackagesWithPriviligesForAllActiveSubscriptions system API" am: 0024076b1a

Browse Source 
am: bf43ca5c69

Change-Id: I441c7160fe32380d3a4172ccb6924de6faf8d3a3
This commit is contained in:
Shuo Qian
2019-12-06 14:17:17 -08:00
committed by android-build-merger
parent 088c61aaf4 bf43ca5c69
commit 347e67e1a9
4 changed files with 16 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
api/system-current.txt
View File

@@ -8695,6 +8695,7 @@ package android.telephony {
method @Nullable @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public android.telephony.ImsiEncryptionInfo getCarrierInfoForImsiEncryption(int); method @Nullable @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public android.telephony.ImsiEncryptionInfo getCarrierInfoForImsiEncryption(int);
method public java.util.List<java.lang.String> getCarrierPackageNamesForIntent(android.content.Intent); method public java.util.List<java.lang.String> getCarrierPackageNamesForIntent(android.content.Intent);
method public java.util.List<java.lang.String> getCarrierPackageNamesForIntentAndPhone(android.content.Intent, int); method public java.util.List<java.lang.String> getCarrierPackageNamesForIntentAndPhone(android.content.Intent, int);
method @NonNull @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public java.util.List<java.lang.String> getCarrierPrivilegedPackagesForAllActiveSubscriptions();
method @Nullable @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public android.telephony.CarrierRestrictionRules getCarrierRestrictionRules(); method @Nullable @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public android.telephony.CarrierRestrictionRules getCarrierRestrictionRules();
method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public String getCdmaMdn(); method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public String getCdmaMdn();
method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public String getCdmaMdn(int); method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public String getCdmaMdn(int);

1
services/tests/servicestests/AndroidManifest.xml
View File

@@ -40,6 +40,7 @@
<uses-permission android:name="android.permission.INTERACT_ACROSS_USERS_FULL" /> <uses-permission android:name="android.permission.INTERACT_ACROSS_USERS_FULL" />
<uses-permission android:name="android.permission.MANAGE_DEVICE_ADMINS" /> <uses-permission android:name="android.permission.MANAGE_DEVICE_ADMINS" />
<uses-permission android:name="android.permission.MODIFY_PHONE_STATE" /> <uses-permission android:name="android.permission.MODIFY_PHONE_STATE" />
<uses-permission android:name="android.permission.READ_PRIVILEGED_PHONE_STATE" />
<uses-permission android:name="android.permission.INTERNET" /> <uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.CHANGE_NETWORK_STATE" /> <uses-permission android:name="android.permission.CHANGE_NETWORK_STATE" />
<uses-permission android:name="android.permission.PACKET_KEEPALIVE_OFFLOAD" /> <uses-permission android:name="android.permission.PACKET_KEEPALIVE_OFFLOAD" />

3
services/usage/java/com/android/server/usage/AppStandbyController.java
View File

@@ -1356,7 +1356,8 @@ public class AppStandbyController {
private void fetchCarrierPrivilegedAppsLocked() { private void fetchCarrierPrivilegedAppsLocked() {
TelephonyManager telephonyManager = TelephonyManager telephonyManager =
mContext.getSystemService(TelephonyManager.class); mContext.getSystemService(TelephonyManager.class);
mCarrierPrivilegedApps = telephonyManager.getPackagesWithCarrierPrivilegesForAllPhones(); mCarrierPrivilegedApps =
telephonyManager.getCarrierPrivilegedPackagesForAllActiveSubscriptions();
mHaveCarrierPrivilegedApps = true; mHaveCarrierPrivilegedApps = true;
if (DEBUG) { if (DEBUG) {
Slog.d(TAG, "apps with carrier privilege " + mCarrierPrivilegedApps); Slog.d(TAG, "apps with carrier privilege " + mCarrierPrivilegedApps);

16
telephony/java/android/telephony/TelephonyManager.java
View File

@@ -8008,17 +8008,25 @@ public class TelephonyManager {
return Collections.EMPTY_LIST; return Collections.EMPTY_LIST;
} }
/** @hide */ /**
public List<String> getPackagesWithCarrierPrivilegesForAllPhones() { * Get the names of packages with carrier privileges for all the active subscriptions.
*
* @hide
*/
@SystemApi
@RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE)
@NonNull
public List<String> getCarrierPrivilegedPackagesForAllActiveSubscriptions() {
try { try {
ITelephony telephony = getITelephony(); ITelephony telephony = getITelephony();
if (telephony != null) { if (telephony != null) {
return telephony.getPackagesWithCarrierPrivilegesForAllPhones(); return telephony.getPackagesWithCarrierPrivilegesForAllPhones();
} }
} catch (RemoteException ex) { } catch (RemoteException ex) {
Rlog.e(TAG, "getPackagesWithCarrierPrivilegesForAllPhones RemoteException", ex); Rlog.e(TAG, "getCarrierPrivilegedPackagesForAllActiveSubscriptions RemoteException",
ex);
} catch (NullPointerException ex) { } catch (NullPointerException ex) {
Rlog.e(TAG, "getPackagesWithCarrierPrivilegesForAllPhones NPE", ex); Rlog.e(TAG, "getCarrierPrivilegedPackagesForAllActiveSubscriptions NPE", ex);
} }
return Collections.EMPTY_LIST; return Collections.EMPTY_LIST;
} }