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

Merge "Re-enable use of isPrivilegedApp()"

Browse Source 
am: bd51de1b20

Change-Id: I3e41058a76b840dfcd1b5171b8c6688509f1fd7d
This commit is contained in:
Neil Fuller
2017-07-13 10:59:41 +00:00
committed by android-build-merger
parent ae21b89414 bd51de1b20
commit a5a493cc19
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.
// TODO(nfuller) Uncomment or remove the code below. Currently an app stops being a priv-app
// after it is replaced by one in data so this check fails. http://b/35995024
// try {
// if (!mPackageManagerHelper.isPrivilegedApp(mUpdateAppPackageName)) {
// throw failWithException(
// "Update app " + mUpdateAppPackageName + " must be a priv-app.", null);
// }
// } catch (PackageManager.NameNotFoundException e) {
// throw failWithException("Could not determine update app package details for "
// + mUpdateAppPackageName, e);
// }
try {
if (!mPackageManagerHelper.isPrivilegedApp(mUpdateAppPackageName)) {
throw logAndThrowRuntimeException(
"Update app " + mUpdateAppPackageName + " must be a priv-app.", null);
}
} catch (PackageManager.NameNotFoundException e) {
throw logAndThrowRuntimeException("Could not determine update app package details for "
+ mUpdateAppPackageName, e);
}
// 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.
Slog.d(TAG, "Update app " + mUpdateAppPackageName + " is valid.");
// Validate the data application package.
// TODO(nfuller) Uncomment or remove the code below. Currently an app stops being a priv-app
// after it is replaced by one in data. http://b/35995024
// try {
// if (!mPackageManagerHelper.isPrivilegedApp(mDataAppPackageName)) {
// throw failWithException(
// "Data app " + mDataAppPackageName + " must be a priv-app.", null);
// }
// } catch (PackageManager.NameNotFoundException e) {
// throw failWithException("Could not determine data app package details for "
// + mDataAppPackageName, e);
// }
try {
if (!mPackageManagerHelper.isPrivilegedApp(mDataAppPackageName)) {
throw logAndThrowRuntimeException(
"Data app " + mDataAppPackageName + " must be a priv-app.", null);
}
} catch (PackageManager.NameNotFoundException e) {
throw logAndThrowRuntimeException("Could not determine data app package details for "
+ mDataAppPackageName, e);
}
// 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.
Slog.d(TAG, "Data app " + mDataAppPackageName + " is valid.");