Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a5a493cc authored by Neil Fuller's avatar Neil Fuller Committed by android-build-merger
Browse files

Merge "Re-enable use of isPrivilegedApp()" 

am: bd51de1b

Change-Id: I3e41058a76b840dfcd1b5171b8c6688509f1fd7d
parents ae21b894 bd51de1b

services/core/java/com/android/server/timezone/PackageTracker.java

+18 −22
Original line number Original line Diff line number Diff line
@@ -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.");