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

Commit 07dbf8e8 authored by Faye Yan's avatar Faye Yan Committed by Android (Google) Code Review
Browse files

Merge "Revert denying USE_FULL_SCREEN_INTENT unless allowlisted in U Beta3." into udc-dev

parents a571b3d5 b01aa9cc

core/res/res/values/config.xml

+0 −3
Original line number Diff line number Diff line
@@ -1392,9 +1392,6 @@ 
    <!-- Number of notifications to keep in the notification service historical archive -->

    <integer name="config_notificationServiceArchiveSize">100</integer>



    <!-- List of packages that will be able to use full screen intent in notifications by default -->

    <string-array name="config_useFullScreenIntentPackages" translatable="false" />



    <!-- Allow the menu hard key to be disabled in LockScreen on some devices -->

    <bool name="config_disableMenuKeyInLockScreen">false</bool>

core/res/res/values/symbols.xml

+0 −1
Original line number Diff line number Diff line
@@ -2020,7 +2020,6 @@ 
  <java-symbol type="integer" name="config_notificationsBatteryMediumARGB" />

  <java-symbol type="integer" name="config_notificationsBatteryNearlyFullLevel" />

  <java-symbol type="integer" name="config_notificationServiceArchiveSize" />

  <java-symbol type="array" name="config_useFullScreenIntentPackages" />

  <java-symbol type="integer" name="config_previousVibrationsDumpLimit" />

  <java-symbol type="integer" name="config_defaultVibrationAmplitude" />

  <java-symbol type="dimen" name="config_hapticChannelMaxVibrationAmplitude" />

services/core/java/com/android/server/pm/permission/PermissionManagerServiceImpl.java

+0 −20
Original line number Diff line number Diff line
@@ -23,7 +23,6 @@ import static android.Manifest.permission.WRITE_EXTERNAL_STORAGE; 
import static android.app.AppOpsManager.MODE_ALLOWED;

import static android.app.AppOpsManager.MODE_ERRORED;

import static android.content.pm.PackageInstaller.SessionParams.PERMISSION_STATE_DEFAULT;

import static android.content.pm.PackageInstaller.SessionParams.PERMISSION_STATE_DENIED;

import static android.content.pm.PackageInstaller.SessionParams.PERMISSION_STATE_GRANTED;

import static android.content.pm.PackageManager.FLAGS_PERMISSION_RESTRICTION_ANY_EXEMPT;

import static android.content.pm.PackageManager.FLAG_PERMISSION_APPLY_RESTRICTION;
@@ -3657,25 +3656,6 @@ public class PermissionManagerServiceImpl implements PermissionManagerServiceInt 
        for (String permission : pkg.getRequestedPermissions()) {

            Integer permissionState = permissionStates.get(permission);



            if (Objects.equals(permission, Manifest.permission.USE_FULL_SCREEN_INTENT)

                    && permissionState == null) {

                final PackageStateInternal ps;

                final long token = Binder.clearCallingIdentity();

                try {

                    ps = mPackageManagerInt.getPackageStateInternal(pkg.getPackageName());

                } finally {

                    Binder.restoreCallingIdentity(token);

                }

                final String[] useFullScreenIntentPackageNames =

                        mContext.getResources().getStringArray(

                                com.android.internal.R.array.config_useFullScreenIntentPackages);

                final boolean canUseFullScreenIntent = (ps != null && ps.isSystem())

                        || ArrayUtils.contains(useFullScreenIntentPackageNames,

                                pkg.getPackageName());

                permissionState = canUseFullScreenIntent ? PERMISSION_STATE_GRANTED

                        : PERMISSION_STATE_DENIED;

            }



            if (permissionState == null || permissionState == PERMISSION_STATE_DEFAULT) {

                continue;

            }