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

Commit ff7b876d authored by android-build-team Robot's avatar android-build-team Robot
Browse files

release-request-e73a0a41-91c3-4249-808e-8d196d54a344-for-git_oc-mr1-release-42... 

release-request-e73a0a41-91c3-4249-808e-8d196d54a344-for-git_oc-mr1-release-4273744 snap-temp-L04700000093069831

Change-Id: If4a9556a5247f9deda326bccd2fa6208dc60b3fd
parents 45779eec 8c8dce35

src/com/android/packageinstaller/permission/model/Permission.java

+1 −1
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ public final class Permission { 
        mAppOp = appOp;

        mAppOpAllowed = appOpAllowed;

        mFlags = flags;

        mIsEphemeral = (protectionLevel & PermissionInfo.PROTECTION_FLAG_EPHEMERAL) != 0;

        mIsEphemeral = (protectionLevel & PermissionInfo.PROTECTION_FLAG_INSTANT) != 0;

        mIsRuntimeOnly = (protectionLevel & PermissionInfo.PROTECTION_FLAG_RUNTIME_ONLY) != 0;

    }

src/com/android/packageinstaller/permission/ui/GrantPermissionsActivity.java

+1 −1
Original line number Diff line number Diff line
@@ -384,7 +384,7 @@ public class GrantPermissionsActivity extends OverlayTouchActivity 
                    != PermissionInfo.PROTECTION_DANGEROUS) {

                return PERMISSION_DENIED;

            }

            if ((pInfo.protectionLevel & PermissionInfo.PROTECTION_FLAG_EPHEMERAL) == 0

            if ((pInfo.protectionLevel & PermissionInfo.PROTECTION_FLAG_INSTANT) == 0

                    && callingPackageInfo.applicationInfo.isInstantApp()) {

                return PERMISSION_DENIED;

            }

src/com/android/packageinstaller/permission/ui/handheld/AllAppPermissionsFragment.java

+1 −1
Original line number Diff line number Diff line
@@ -153,7 +153,7 @@ public final class AllAppPermissionsFragment extends SettingsWithHeader { 
                    }



                    if (appInfo.isInstantApp()

                            && (perm.protectionLevel & PermissionInfo.PROTECTION_FLAG_EPHEMERAL)

                            && (perm.protectionLevel & PermissionInfo.PROTECTION_FLAG_INSTANT)

                                == 0) {

                        continue;

                    }

src/com/android/packageinstaller/permission/ui/television/AllAppPermissionsFragment.java

+1 −1
Original line number Diff line number Diff line
@@ -157,7 +157,7 @@ public final class AllAppPermissionsFragment extends SettingsWithHeader { 
                    continue;

                }

                if (appInfo.isInstantApp()

                        && (perm.protectionLevel & PermissionInfo.PROTECTION_FLAG_EPHEMERAL) == 0) {

                        && (perm.protectionLevel & PermissionInfo.PROTECTION_FLAG_INSTANT) == 0) {

                    continue;

                }

                if (appInfo.targetSdkVersion < Build.VERSION_CODES.M

src/com/android/packageinstaller/wear/WearPackageInstallerService.java

+2 −0
Original line number Diff line number Diff line
@@ -256,6 +256,8 @@ public class WearPackageInstallerService extends Service { 
                return;

            }



            pkg.applicationInfo.sourceDir = tempFile.getPath();

            pkg.applicationInfo.publicSourceDir = tempFile.getPath();

            getLabelAndUpdateNotification(packageName,

                    getString(R.string.installing_app, pkg.applicationInfo.loadLabel(pm)));