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

Commit 9d1dda60 authored by Alex Buynytskyy's avatar Alex Buynytskyy Committed by Android (Google) Code Review
Browse files

Merge "Use strings to better represent resource values." into main

parents 6ae33d60 b94323d2

core/java/android/content/pm/ArchivedPackageParcel.aidl

+5 −5
Original line number Diff line number Diff line
@@ -29,9 +29,9 @@ parcelable ArchivedPackageParcel { 
    int versionCode;

    int versionCodeMajor;

    int targetSdkVersion;

    boolean backupAllowed;

    boolean defaultToDeviceProtectedStorage;

    boolean requestLegacyExternalStorage;

    boolean userDataFragile;

    boolean clearUserDataOnFailedRestoreAllowed;

    String backupAllowed;

    String defaultToDeviceProtectedStorage;

    String requestLegacyExternalStorage;

    String userDataFragile;

    String clearUserDataOnFailedRestoreAllowed;

}

core/java/android/content/pm/parsing/ApkLite.java

+12 −5
Original line number Diff line number Diff line
@@ -23,9 +23,11 @@ import android.content.pm.PackageInfo; 
import android.content.pm.PackageManager;

import android.content.pm.SigningDetails;

import android.content.pm.VerifierInfo;

import android.os.Build;



import com.android.internal.util.CollectionUtils;

import com.android.internal.util.DataClass;

import com.android.internal.util.XmlUtils;



import java.util.List;

import java.util.Set;
@@ -255,11 +257,16 @@ public class ApkLite { 
        mRollbackDataPolicy = 0;

        mHasDeviceAdminReceiver = false;

        mIsSdkLibrary = false;

        mBackupAllowed = archivedPackage.backupAllowed;

        mDefaultToDeviceProtectedStorage = archivedPackage.defaultToDeviceProtectedStorage;

        mRequestLegacyExternalStorage = archivedPackage.requestLegacyExternalStorage;

        mUserDataFragile = archivedPackage.userDataFragile;

        mClearUserDataOnFailedRestoreAllowed = archivedPackage.clearUserDataOnFailedRestoreAllowed;

        // @see ParsingPackageUtils#parseBaseAppBasicFlags

        mBackupAllowed = XmlUtils.convertValueToBoolean(archivedPackage.backupAllowed, true);

        mDefaultToDeviceProtectedStorage = XmlUtils.convertValueToBoolean(

                archivedPackage.defaultToDeviceProtectedStorage, false);

        mRequestLegacyExternalStorage = XmlUtils.convertValueToBoolean(

                archivedPackage.requestLegacyExternalStorage,

                mTargetSdkVersion < Build.VERSION_CODES.Q);

        mUserDataFragile = XmlUtils.convertValueToBoolean(archivedPackage.userDataFragile, false);

        mClearUserDataOnFailedRestoreAllowed = XmlUtils.convertValueToBoolean(

                archivedPackage.clearUserDataOnFailedRestoreAllowed, true);

    }



    /**

services/core/java/com/android/server/pm/PackageManagerService.java

+8 −7
Original line number Diff line number Diff line
@@ -6325,13 +6325,14 @@ public class PackageManagerService implements PackageSender, TestUtilityService 
            archPkg.targetSdkVersion = apk.getTargetSdkVersion();



            // These get translated in flags important for user data management.

            archPkg.backupAllowed = apk.isBackupAllowed();

            archPkg.defaultToDeviceProtectedStorage =

                    apk.isDefaultToDeviceProtectedStorage();

            archPkg.requestLegacyExternalStorage = apk.isRequestLegacyExternalStorage();

            archPkg.userDataFragile = apk.isUserDataFragile();

            archPkg.clearUserDataOnFailedRestoreAllowed =

                    apk.isClearUserDataOnFailedRestoreAllowed();

            archPkg.backupAllowed = String.valueOf(apk.isBackupAllowed());

            archPkg.defaultToDeviceProtectedStorage = String.valueOf(

                    apk.isDefaultToDeviceProtectedStorage());

            archPkg.requestLegacyExternalStorage = String.valueOf(

                    apk.isRequestLegacyExternalStorage());

            archPkg.userDataFragile = String.valueOf(apk.isUserDataFragile());

            archPkg.clearUserDataOnFailedRestoreAllowed = String.valueOf(

                    apk.isClearUserDataOnFailedRestoreAllowed());



            return archPkg;

        }