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

Merge "Re-enable use of isPrivilegedApp()" am: bd51de1b20 am: a5a493cc19

Browse Source 
am: 3a6b550753

Change-Id: I0e2e6fa93a4f15023f17efba275c236880863ccd
This commit is contained in:
Neil Fuller
2017-07-13 11:13:09 +00:00
committed by android-build-merger
parent 00c73c7784 3a6b550753
commit 154eca93e7
1 changed files with 18 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
services/core/java/com/android/server/timezone/PackageTracker.java
View File

@@ -164,33 +164,29 @@ public class PackageTracker implements IntentHelper.Listener {
} }
// Validate the updater application package. // Validate the updater application package.
// TODO(nfuller) Uncomment or remove the code below. Currently an app stops being a priv-app try {
// after it is replaced by one in data so this check fails. http://b/35995024 if (!mPackageManagerHelper.isPrivilegedApp(mUpdateAppPackageName)) {
// try { throw logAndThrowRuntimeException(
// if (!mPackageManagerHelper.isPrivilegedApp(mUpdateAppPackageName)) { "Update app " + mUpdateAppPackageName + " must be a priv-app.", null);
// throw failWithException( }
// "Update app " + mUpdateAppPackageName + " must be a priv-app.", null); } catch (PackageManager.NameNotFoundException e) {
// } throw logAndThrowRuntimeException("Could not determine update app package details for "
// } catch (PackageManager.NameNotFoundException e) { + mUpdateAppPackageName, e);
// throw failWithException("Could not determine update app package details for " }
// + mUpdateAppPackageName, e);
// }
// TODO(nfuller) Consider permission checks. While an updated system app retains permissions // TODO(nfuller) Consider permission checks. While an updated system app retains permissions
// obtained by the system version it's not clear how to check them. // obtained by the system version it's not clear how to check them.
Slog.d(TAG, "Update app " + mUpdateAppPackageName + " is valid."); Slog.d(TAG, "Update app " + mUpdateAppPackageName + " is valid.");
// Validate the data application package. // Validate the data application package.
// TODO(nfuller) Uncomment or remove the code below. Currently an app stops being a priv-app try {
// after it is replaced by one in data. http://b/35995024 if (!mPackageManagerHelper.isPrivilegedApp(mDataAppPackageName)) {
// try { throw logAndThrowRuntimeException(
// if (!mPackageManagerHelper.isPrivilegedApp(mDataAppPackageName)) { "Data app " + mDataAppPackageName + " must be a priv-app.", null);
// throw failWithException( }
// "Data app " + mDataAppPackageName + " must be a priv-app.", null); } catch (PackageManager.NameNotFoundException e) {
// } throw logAndThrowRuntimeException("Could not determine data app package details for "
// } catch (PackageManager.NameNotFoundException e) { + mDataAppPackageName, e);
// throw failWithException("Could not determine data app package details for " }
// + mDataAppPackageName, e);
// }
// TODO(nfuller) Consider permission checks. While an updated system app retains permissions // TODO(nfuller) Consider permission checks. While an updated system app retains permissions
// obtained by the system version it's not clear how to check them. // obtained by the system version it's not clear how to check them.
Slog.d(TAG, "Data app " + mDataAppPackageName + " is valid."); Slog.d(TAG, "Data app " + mDataAppPackageName + " is valid.");