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

Merge \"Disallow user to block notification from OobConfig\" into nyc-mr1-dev

Browse Source 
am: 28763c5a77

Change-Id: Ie03835fd81e997e9feafe83ba50e6e4d9f10c820
This commit is contained in:
Tony Mak
2016-07-15 16:20:45 +00:00
committed by android-build-merger
parent 4481b51667 28763c5a77
commit 65aeef9d87
2 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
packages/SettingsLib/src/com/android/settingslib/Utils.java
View File

@@ -169,7 +169,7 @@ public class Utils {
* Determine whether a package is a "system package", in which case certain things (like * Determine whether a package is a "system package", in which case certain things (like
* disabling notifications or disabling the package altogether) should be disallowed. * disabling notifications or disabling the package altogether) should be disallowed.
*/ */
public static boolean isSystemPackage(PackageManager pm, PackageInfo pkg) { public static boolean isSystemPackage(Resources resources, PackageManager pm, PackageInfo pkg) {
if (sSystemSignature == null) { if (sSystemSignature == null) {
sSystemSignature = new Signature[]{ getSystemSignature(pm) }; sSystemSignature = new Signature[]{ getSystemSignature(pm) };
} }
@@ -187,7 +187,8 @@ public class Utils {
|| pkg.packageName.equals(sPermissionControllerPackageName) || pkg.packageName.equals(sPermissionControllerPackageName)
|| pkg.packageName.equals(sServicesSystemSharedLibPackageName) || pkg.packageName.equals(sServicesSystemSharedLibPackageName)
|| pkg.packageName.equals(sSharedSystemSharedLibPackageName) || pkg.packageName.equals(sSharedSystemSharedLibPackageName)
|| pkg.packageName.equals(PrintManager.PRINT_SPOOLER_PACKAGE_NAME); || pkg.packageName.equals(PrintManager.PRINT_SPOOLER_PACKAGE_NAME)
|| isDeviceProvisioningPackage(resources, pkg.packageName);
} }
private static Signature getFirstSignature(PackageInfo pkg) { private static Signature getFirstSignature(PackageInfo pkg) {
@@ -205,4 +206,14 @@ public class Utils {
} }
return null; return null;
} }
/**
* Returns {@code true} if the supplied package is the device provisioning app. Otherwise,
* returns {@code false}.
*/
public static boolean isDeviceProvisioningPackage(Resources resources, String packageName) {
String deviceProvisioningPackage = resources.getString(
com.android.internal.R.string.config_deviceProvisioningPackage);
return deviceProvisioningPackage != null && deviceProvisioningPackage.equals(packageName);
}
} }

2
packages/SystemUI/src/com/android/systemui/statusbar/NotificationGuts.java
View File

@@ -186,7 +186,7 @@ public class NotificationGuts extends LinearLayout implements TunerService.Tunab
try { try {
final PackageInfo info = final PackageInfo info =
pm.getPackageInfo(sbn.getPackageName(), PackageManager.GET_SIGNATURES); pm.getPackageInfo(sbn.getPackageName(), PackageManager.GET_SIGNATURES);
systemApp = Utils.isSystemPackage(pm, info); systemApp = Utils.isSystemPackage(getResources(), pm, info);
} catch (PackageManager.NameNotFoundException e) { } catch (PackageManager.NameNotFoundException e) {
// unlikely. // unlikely.
} }