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

Unverified Commit 6422e600 authored by Michael Bestas's avatar Michael Bestas
Browse files

Merge tag 'android-12.1.0_r11' into staging/lineage-19.1_merge-android-12.1.0_r11 

Android 12.1.0 release 11

# -----BEGIN PGP SIGNATURE-----
#
# iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCYsXEugAKCRDorT+BmrEO
# eAB0AJ9JP7U8IhvBBWWMncOSn4UczVuGeACfcoPzzsmeaKLmn6qi1EDCV6Scvdo=
# =rSdZ
# -----END PGP SIGNATURE-----
# gpg: Signature made Wed Jul  6 20:22:02 2022 EEST
# gpg:                using DSA key 4340D13570EF945E83810964E8AD3F819AB10E78
# gpg: Good signature from "The Android Open Source Project <initial-contribution@android.com>" [marginal]
# gpg: initial-contribution@android.com: Verified 1242 signatures in the past
#      8 months.  Encrypted 4 messages in the past 5 months.
# gpg: WARNING: This key is not certified with sufficiently trusted signatures!
# gpg:          It is not certain that the signature belongs to the owner.
# Primary key fingerprint: 4340 D135 70EF 945E 8381  0964 E8AD 3F81 9AB1 0E78

# By Eric Biggers (5) and others
# Via Android Build Coastguard Worker (4) and Android (Google) Code Review (3)
* tag 'android-12.1.0_r11':
  Revert "[DO NOT MERGE] Do not clear calling identify when using BiometricPrompt from FingerprintService."
  DO NOT MERGE: Revert "RESTRICT AUTOMERGE: Polish IME transition from fullscree..."
  Revert "DO NOT MERGE Suppress notifications when device enter lockdown"
  Update ServiceState broadcast for location permissions
  Add excludedPackages parameter to broadcast
  USB: Increase debounce time for DISCONNECT processing (revised)
  DO NOT MERGE Suppress notifications when device enter lockdown
  [DO NOT MERGE] Do not clear calling identify when using BiometricPrompt from FingerprintService.
  Log to EventLog on prepareUserStorage failure
  Ignore errors preparing user storage for existing users
  UserDataPreparer: reboot to recovery for system user only
  UserDataPreparer: reboot to recovery if preparing user storage fails
  StorageManagerService: don't ignore failures to prepare user storage

Change-Id: If7cb7526f3991cdd301d453c06da27287e0ede90
parents faf136b1 7920f82a

core/java/android/app/ActivityManager.java

+2 −2
Original line number Diff line number Diff line
@@ -4366,8 +4366,8 @@ public class ActivityManager { 
        try {

            getService().broadcastIntentWithFeature(

                    null, null, intent, null, null, Activity.RESULT_OK, null, null,

                    null /*requiredPermissions*/, null /*excludedPermissions*/, appOp, null, false,

                    true, userId);

                    null /*requiredPermissions*/, null /*excludedPermissions*/,

                    null /*excludedPackages*/, appOp, null, false, true, userId);

        } catch (RemoteException ex) {

        }

    }

core/java/android/app/ContextImpl.java

+25 −24
Original line number Diff line number Diff line
@@ -1185,7 +1185,7 @@ class ContextImpl extends Context { 
            ActivityManager.getService().broadcastIntentWithFeature(

                    mMainThread.getApplicationThread(), getAttributionTag(), intent, resolvedType,

                    null, Activity.RESULT_OK, null, null, null, null /*excludedPermissions=*/,

                    AppOpsManager.OP_NONE, null, false, false, getUserId());

                    null, AppOpsManager.OP_NONE, null, false, false, getUserId());

        } catch (RemoteException e) {

            throw e.rethrowFromSystemServer();

        }
@@ -1202,7 +1202,7 @@ class ContextImpl extends Context { 
            ActivityManager.getService().broadcastIntentWithFeature(

                    mMainThread.getApplicationThread(), getAttributionTag(), intent, resolvedType,

                    null, Activity.RESULT_OK, null, null, receiverPermissions,

                    null /*excludedPermissions=*/, AppOpsManager.OP_NONE, null, false, false,

                    null /*excludedPermissions=*/, null, AppOpsManager.OP_NONE, null, false, false,

                    getUserId());

        } catch (RemoteException e) {

            throw e.rethrowFromSystemServer();
@@ -1218,7 +1218,7 @@ class ContextImpl extends Context { 
            ActivityManager.getService().broadcastIntentWithFeature(

                    mMainThread.getApplicationThread(), getAttributionTag(), intent, resolvedType,

                    null, Activity.RESULT_OK, null, null, receiverPermissions,

                    null /*excludedPermissions=*/, AppOpsManager.OP_NONE, null, false, false,

                    null /*excludedPermissions=*/, null, AppOpsManager.OP_NONE, null, false, false,

                    getUserId());

        } catch (RemoteException e) {

            throw e.rethrowFromSystemServer();
@@ -1235,8 +1235,8 @@ class ContextImpl extends Context { 
            ActivityManager.getService().broadcastIntentWithFeature(

                    mMainThread.getApplicationThread(), getAttributionTag(), intent, resolvedType,

                    null, Activity.RESULT_OK, null, null, receiverPermissions,

                    null /*excludedPermissions=*/, AppOpsManager.OP_NONE, options, false, false,

                    getUserId());

                    null /*excludedPermissions=*/, null /*excludedPackages*/,

                    AppOpsManager.OP_NONE, options, false, false, getUserId());

        } catch (RemoteException e) {

            throw e.rethrowFromSystemServer();

        }
@@ -1251,7 +1251,7 @@ class ContextImpl extends Context { 
            ActivityManager.getService().broadcastIntentWithFeature(

                    mMainThread.getApplicationThread(), getAttributionTag(), intent, resolvedType,

                    null, Activity.RESULT_OK, null, null, receiverPermissions,

                    null /*excludedPermissions=*/, AppOpsManager.OP_NONE, null, false, false,

                    null /*excludedPermissions=*/, null, AppOpsManager.OP_NONE, null, false, false,

                    user.getIdentifier());

        } catch (RemoteException e) {

            throw e.rethrowFromSystemServer();
@@ -1260,7 +1260,7 @@ class ContextImpl extends Context { 


    @Override

    public void sendBroadcastMultiplePermissions(Intent intent, String[] receiverPermissions,

            String[] excludedPermissions) {

            String[] excludedPermissions, String[] excludedPackages) {

        warnIfCallingFromSystemProcess();

        String resolvedType = intent.resolveTypeIfNeeded(getContentResolver());

        try {
@@ -1268,7 +1268,7 @@ class ContextImpl extends Context { 
            ActivityManager.getService().broadcastIntentWithFeature(

                    mMainThread.getApplicationThread(), getAttributionTag(), intent, resolvedType,

                    null, Activity.RESULT_OK, null, null, receiverPermissions, excludedPermissions,

                    AppOpsManager.OP_NONE, null, false, false, getUserId());

                    excludedPackages, AppOpsManager.OP_NONE, null, false, false, getUserId());

        } catch (RemoteException e) {

            throw e.rethrowFromSystemServer();

        }
@@ -1285,8 +1285,8 @@ class ContextImpl extends Context { 
            ActivityManager.getService().broadcastIntentWithFeature(

                    mMainThread.getApplicationThread(), getAttributionTag(), intent, resolvedType,

                    null, Activity.RESULT_OK, null, null, receiverPermissions,

                    null /*excludedPermissions=*/, AppOpsManager.OP_NONE, options, false, false,

                    getUserId());

                    null /*excludedPermissions=*/, null, AppOpsManager.OP_NONE, options, false,

                    false, getUserId());

        } catch (RemoteException e) {

            throw e.rethrowFromSystemServer();

        }
@@ -1303,7 +1303,7 @@ class ContextImpl extends Context { 
            ActivityManager.getService().broadcastIntentWithFeature(

                    mMainThread.getApplicationThread(), getAttributionTag(), intent, resolvedType,

                    null, Activity.RESULT_OK, null, null, receiverPermissions,

                    null /*excludedPermissions=*/, appOp, null, false, false, getUserId());

                    null /*excludedPermissions=*/, null, appOp, null, false, false, getUserId());

        } catch (RemoteException e) {

            throw e.rethrowFromSystemServer();

        }
@@ -1320,7 +1320,7 @@ class ContextImpl extends Context { 
            ActivityManager.getService().broadcastIntentWithFeature(

                    mMainThread.getApplicationThread(), getAttributionTag(), intent, resolvedType,

                    null, Activity.RESULT_OK, null, null, receiverPermissions,

                    null /*excludedPermissions=*/, AppOpsManager.OP_NONE, null, true, false,

                    null /*excludedPermissions=*/, null, AppOpsManager.OP_NONE, null, true, false,

                    getUserId());

        } catch (RemoteException e) {

            throw e.rethrowFromSystemServer();
@@ -1384,7 +1384,7 @@ class ContextImpl extends Context { 
            ActivityManager.getService().broadcastIntentWithFeature(

                    mMainThread.getApplicationThread(), getAttributionTag(), intent, resolvedType,

                    rd, initialCode, initialData, initialExtras, receiverPermissions,

                    null /*excludedPermissions=*/, appOp, options, true, false, getUserId());

                    null /*excludedPermissions=*/, null, appOp, options, true, false, getUserId());

        } catch (RemoteException e) {

            throw e.rethrowFromSystemServer();

        }
@@ -1398,7 +1398,7 @@ class ContextImpl extends Context { 
            ActivityManager.getService().broadcastIntentWithFeature(

                    mMainThread.getApplicationThread(), getAttributionTag(), intent, resolvedType,

                    null, Activity.RESULT_OK, null, null, null, null /*excludedPermissions=*/,

                    AppOpsManager.OP_NONE, null, false, false, user.getIdentifier());

                    null, AppOpsManager.OP_NONE, null, false, false, user.getIdentifier());

        } catch (RemoteException e) {

            throw e.rethrowFromSystemServer();

        }
@@ -1421,8 +1421,8 @@ class ContextImpl extends Context { 
            ActivityManager.getService().broadcastIntentWithFeature(

                    mMainThread.getApplicationThread(), getAttributionTag(), intent, resolvedType,

                    null, Activity.RESULT_OK, null, null, receiverPermissions,

                    null /*excludedPermissions=*/, AppOpsManager.OP_NONE, options, false, false,

                    user.getIdentifier());

                    null /*excludedPermissions=*/, null, AppOpsManager.OP_NONE, options, false,

                    false, user.getIdentifier());

        } catch (RemoteException e) {

            throw e.rethrowFromSystemServer();

        }
@@ -1439,7 +1439,8 @@ class ContextImpl extends Context { 
            ActivityManager.getService().broadcastIntentWithFeature(

                    mMainThread.getApplicationThread(), getAttributionTag(), intent, resolvedType,

                    null, Activity.RESULT_OK, null, null, receiverPermissions,

                    null /*excludedPermissions=*/, appOp, null, false, false, user.getIdentifier());

                    null /*excludedPermissions=*/, null, appOp, null, false, false,

                    user.getIdentifier());

        } catch (RemoteException e) {

            throw e.rethrowFromSystemServer();

        }
@@ -1490,7 +1491,7 @@ class ContextImpl extends Context { 
            ActivityManager.getService().broadcastIntentWithFeature(

                    mMainThread.getApplicationThread(), getAttributionTag(), intent, resolvedType,

                    rd, initialCode, initialData, initialExtras, receiverPermissions,

                    null /*excludedPermissions=*/, appOp, options, true, false,

                    null /*excludedPermissions=*/, null, appOp, options, true, false,

                    user.getIdentifier());

        } catch (RemoteException e) {

            throw e.rethrowFromSystemServer();
@@ -1532,7 +1533,7 @@ class ContextImpl extends Context { 
            ActivityManager.getService().broadcastIntentWithFeature(

                    mMainThread.getApplicationThread(), getAttributionTag(), intent, resolvedType,

                    null, Activity.RESULT_OK, null, null, null, null /*excludedPermissions=*/,

                    AppOpsManager.OP_NONE, null, false, true, getUserId());

                    null, AppOpsManager.OP_NONE, null, false, true, getUserId());

        } catch (RemoteException e) {

            throw e.rethrowFromSystemServer();

        }
@@ -1571,7 +1572,7 @@ class ContextImpl extends Context { 
            ActivityManager.getService().broadcastIntentWithFeature(

                    mMainThread.getApplicationThread(), getAttributionTag(), intent, resolvedType,

                    null, Activity.RESULT_OK, null, null, null, null /*excludedPermissions=*/,

                    AppOpsManager.OP_NONE, options, false, true, getUserId());

                    null, AppOpsManager.OP_NONE, options, false, true, getUserId());

        } catch (RemoteException e) {

            throw e.rethrowFromSystemServer();

        }
@@ -1607,7 +1608,7 @@ class ContextImpl extends Context { 
            ActivityManager.getService().broadcastIntentWithFeature(

                    mMainThread.getApplicationThread(), getAttributionTag(), intent, resolvedType,

                    rd, initialCode, initialData, initialExtras, null,

                    null /*excludedPermissions=*/, AppOpsManager.OP_NONE, null, true, true,

                    null /*excludedPermissions=*/, null, AppOpsManager.OP_NONE, null, true, true,

                    getUserId());

        } catch (RemoteException e) {

            throw e.rethrowFromSystemServer();
@@ -1640,7 +1641,7 @@ class ContextImpl extends Context { 
            ActivityManager.getService().broadcastIntentWithFeature(

                    mMainThread.getApplicationThread(), getAttributionTag(), intent, resolvedType,

                    null, Activity.RESULT_OK, null, null, null, null /*excludedPermissions=*/,

                    AppOpsManager.OP_NONE, null, false, true, user.getIdentifier());

                    null, AppOpsManager.OP_NONE, null, false, true, user.getIdentifier());

        } catch (RemoteException e) {

            throw e.rethrowFromSystemServer();

        }
@@ -1655,7 +1656,7 @@ class ContextImpl extends Context { 
            ActivityManager.getService().broadcastIntentWithFeature(

                    mMainThread.getApplicationThread(), getAttributionTag(), intent, resolvedType,

                    null, Activity.RESULT_OK, null, null, null, null /*excludedPermissions=*/,

                    AppOpsManager.OP_NONE, options, false, true, user.getIdentifier());

                    null, AppOpsManager.OP_NONE, options, false, true, user.getIdentifier());

        } catch (RemoteException e) {

            throw e.rethrowFromSystemServer();

        }
@@ -1690,7 +1691,7 @@ class ContextImpl extends Context { 
            ActivityManager.getService().broadcastIntentWithFeature(

                    mMainThread.getApplicationThread(), getAttributionTag(), intent, resolvedType,

                    rd, initialCode, initialData, initialExtras, null,

                    null /*excludedPermissions=*/, AppOpsManager.OP_NONE, null, true, true,

                    null /*excludedPermissions=*/, null, AppOpsManager.OP_NONE, null, true, true,

                    user.getIdentifier());

        } catch (RemoteException e) {

            throw e.rethrowFromSystemServer();

core/java/android/app/IActivityManager.aidl

+1 −1
Original line number Diff line number Diff line
@@ -138,7 +138,7 @@ interface IActivityManager { 
    int broadcastIntentWithFeature(in IApplicationThread caller, in String callingFeatureId,

            in Intent intent, in String resolvedType, in IIntentReceiver resultTo, int resultCode,

            in String resultData, in Bundle map, in String[] requiredPermissions, in String[] excludePermissions,

            int appOp, in Bundle options, boolean serialized, boolean sticky, int userId);

            in String[] excludePackages, int appOp, in Bundle options, boolean serialized, boolean sticky, int userId);

    void unbroadcastIntent(in IApplicationThread caller, in Intent intent, int userId);

    @UnsupportedAppUsage

    oneway void finishReceiver(in IBinder who, int resultCode, in String resultData, in Bundle map,

core/java/android/content/Context.java

+13 −0
Original line number Diff line number Diff line
@@ -2212,6 +2212,19 @@ public abstract class Context { 
     */

    public void sendBroadcastMultiplePermissions(@NonNull Intent intent,

            @NonNull String[] receiverPermissions, @Nullable String[] excludedPermissions) {

        sendBroadcastMultiplePermissions(intent, receiverPermissions, excludedPermissions, null);

    }





    /**

     * Like {@link #sendBroadcastMultiplePermissions(Intent, String[], String[])}, but also allows

     * specification of a list of excluded packages.

     *

     * @hide

     */

    public void sendBroadcastMultiplePermissions(@NonNull Intent intent,

            @NonNull String[] receiverPermissions, @Nullable String[] excludedPermissions,

            @Nullable String[] excludedPackages) {

        throw new RuntimeException("Not implemented. Must override in a subclass.");

    }

core/java/android/content/ContextWrapper.java

+4 −2
Original line number Diff line number Diff line
@@ -494,8 +494,10 @@ public class ContextWrapper extends Context { 
    /** @hide */

    @Override

    public void sendBroadcastMultiplePermissions(@NonNull Intent intent,

            @NonNull String[] receiverPermissions, @Nullable String[] excludedPermissions) {

        mBase.sendBroadcastMultiplePermissions(intent, receiverPermissions, excludedPermissions);

            @NonNull String[] receiverPermissions, @Nullable String[] excludedPermissions,

            @Nullable String[] excludedPackages) {

        mBase.sendBroadcastMultiplePermissions(intent, receiverPermissions, excludedPermissions,

                excludedPackages);

    }



    /** @hide */