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

Unverified Commit 92967d26 authored by Michael Bestas's avatar Michael Bestas
Browse files

Merge tag 'android-13.0.0_r30' into staging/lineage-20.0_merge-android-13.0.0_r30 

Android 13.0.0 Release 30 (TQ1A.230205.002)

# -----BEGIN PGP SIGNATURE-----
#
# iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCY9MaBQAKCRDorT+BmrEO
# eD5AAJ41vol3L8qd5mtrVcN6KsgVtVT4SQCgjUDyYJKeU5JqyOQBS3nv0AD0/SU=
# =IIov
# -----END PGP SIGNATURE-----
# gpg: Signature made Fri Jan 27 02:25:41 2023 EET
# 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 1528 signatures in the past
#      15 months.  Encrypted 4 messages in the past 13 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 Yuri Lin (5) and others
# Via Android Build Coastguard Worker
* tag 'android-13.0.0_r30':
  RESTRICT AUTOMERGE Use chain start token in performOpTransaction
  Convert argument to intent in ChooseTypeAndAccountActivity
  Use rule package name in addAutomaticZenRule; specify "android" for all system apps
  Use `android` as packageName instead of `null` for methods used by system to fetch accounts.
  [RESTRICT AUTOMERGE] Correct the behavior of ACTION_PACKAGE_DATA_CLEARED
  Disallow clicks on privacy chip before provisioned
  Revert "Fix system zen rules by using owner package name if caller is system"
  Revert "Check rule package name in ZenModeHelper.addAutomaticRule"
  Fix system zen rules by using owner package name if caller is system
  Check rule package name in ZenModeHelper.addAutomaticRule

Change-Id: Ic5a6b23473cc3072880981aba0efbe2f2c778c82
parents 8f75bfa0 c0061031

core/java/android/accounts/ChooseTypeAndAccountActivity.java

+1 −1
Original line number Diff line number Diff line
@@ -402,7 +402,7 @@ public class ChooseTypeAndAccountActivity extends Activity 
                mExistingAccounts = AccountManager.get(this).getAccountsForPackage(mCallingPackage,

                        mCallingUid);

                intent.setFlags(intent.getFlags() & ~Intent.FLAG_ACTIVITY_NEW_TASK);

                startActivityForResult(intent, REQUEST_ADD_ACCOUNT);

                startActivityForResult(new Intent(intent), REQUEST_ADD_ACCOUNT);

                return;

            }

        } catch (OperationCanceledException e) {

core/java/android/app/AppOpsManager.java

+13 −9
Original line number Diff line number Diff line
@@ -9134,8 +9134,9 @@ public class AppOpsManager { 
     */

    public int startProxyOpNoThrow(int op, @NonNull AttributionSource attributionSource,

            @Nullable String message, boolean skipProxyOperation) {

        return startProxyOpNoThrow(op, attributionSource, message, skipProxyOperation,

                ATTRIBUTION_FLAGS_NONE, ATTRIBUTION_FLAGS_NONE, ATTRIBUTION_CHAIN_ID_NONE);

        return startProxyOpNoThrow(attributionSource.getToken(), op, attributionSource, message,

                skipProxyOperation, ATTRIBUTION_FLAGS_NONE, ATTRIBUTION_FLAGS_NONE,

                ATTRIBUTION_CHAIN_ID_NONE);

    }



    /**
@@ -9147,7 +9148,8 @@ public class AppOpsManager { 
     *

     * @hide

     */

    public int startProxyOpNoThrow(int op, @NonNull AttributionSource attributionSource,

    public int startProxyOpNoThrow(@NonNull IBinder clientId, int op,

            @NonNull AttributionSource attributionSource,

            @Nullable String message, boolean skipProxyOperation, @AttributionFlags

            int proxyAttributionFlags, @AttributionFlags int proxiedAttributionFlags,

            int attributionChainId) {
@@ -9165,7 +9167,7 @@ public class AppOpsManager { 
                }

            }



            SyncNotedAppOp syncOp = mService.startProxyOperation(op,

            SyncNotedAppOp syncOp = mService.startProxyOperation(clientId, op,

                    attributionSource, false, collectionMode == COLLECT_ASYNC, message,

                    shouldCollectMessage, skipProxyOperation, proxyAttributionFlags,

                    proxiedAttributionFlags, attributionChainId);
@@ -9263,9 +9265,10 @@ public class AppOpsManager { 
     */

    public void finishProxyOp(@NonNull String op, int proxiedUid,

            @NonNull String proxiedPackageName, @Nullable String proxiedAttributionTag) {

        finishProxyOp(op, new AttributionSource(mContext.getAttributionSource(),

        IBinder token = mContext.getAttributionSource().getToken();

        finishProxyOp(token, op, new AttributionSource(mContext.getAttributionSource(),

                new AttributionSource(proxiedUid, proxiedPackageName,  proxiedAttributionTag,

                        mContext.getAttributionSource().getToken())), /*skipProxyOperation*/ false);

                        token)), /*skipProxyOperation*/ false);

    }



    /**
@@ -9280,10 +9283,11 @@ public class AppOpsManager { 
     *

     * @hide

     */

    public void finishProxyOp(@NonNull String op, @NonNull AttributionSource attributionSource,

            boolean skipProxyOperation) {

    public void finishProxyOp(@NonNull IBinder clientId, @NonNull String op,

            @NonNull AttributionSource attributionSource, boolean skipProxyOperation) {

        try {

            mService.finishProxyOperation(strOpToOp(op), attributionSource, skipProxyOperation);

            mService.finishProxyOperation(clientId, strOpToOp(op), attributionSource,

                    skipProxyOperation);

        } catch (RemoteException e) {

            throw e.rethrowFromSystemServer();

        }

core/java/android/app/AppOpsManagerInternal.java

+14 −9
Original line number Diff line number Diff line
@@ -26,13 +26,11 @@ import android.util.SparseArray; 
import android.util.SparseIntArray;



import com.android.internal.app.IAppOpsCallback;

import com.android.internal.util.function.DecFunction;

import com.android.internal.util.function.HeptFunction;

import com.android.internal.util.function.HexFunction;

import com.android.internal.util.function.QuadFunction;

import com.android.internal.util.function.QuintConsumer;

import com.android.internal.util.function.QuintFunction;

import com.android.internal.util.function.TriFunction;

import com.android.internal.util.function.UndecFunction;



/**
@@ -135,6 +133,7 @@ public abstract class AppOpsManagerInternal { 
        /**

         * Allows overriding start proxy operation behavior.

         *

         * @param clientId The client calling start, represented by an IBinder

         * @param code The op code to start.

         * @param attributionSource The permission identity of the caller.

         * @param startIfModeDefault Whether to start the op of the mode is default.
@@ -148,11 +147,12 @@ public abstract class AppOpsManagerInternal { 
         * @param superImpl The super implementation.

         * @return The app op note result.

         */

        SyncNotedAppOp startProxyOperation(int code, @NonNull AttributionSource attributionSource,

                boolean startIfModeDefault, boolean shouldCollectAsyncNotedOp, String message,

                boolean shouldCollectMessage, boolean skipProxyOperation, @AttributionFlags

                int proxyAttributionFlags, @AttributionFlags int proxiedAttributionFlags,

                int attributionChainId, @NonNull DecFunction<Integer, AttributionSource, Boolean,

        SyncNotedAppOp startProxyOperation(@NonNull IBinder clientId, int code,

                @NonNull AttributionSource attributionSource, boolean startIfModeDefault,

                boolean shouldCollectAsyncNotedOp, String message, boolean shouldCollectMessage,

                boolean skipProxyOperation, @AttributionFlags int proxyAttributionFlags,

                @AttributionFlags int proxiedAttributionFlags, int attributionChainId,

                @NonNull UndecFunction<IBinder, Integer, AttributionSource, Boolean,

                        Boolean, String, Boolean, Boolean, Integer, Integer, Integer,

                        SyncNotedAppOp> superImpl);
@@ -176,10 +176,15 @@ public abstract class AppOpsManagerInternal { 
         *

         * @param code The op code to finish.

         * @param attributionSource The permission identity of the caller.

         * @param skipProxyOperation Whether to skip the proxy in the proxy/proxied operation

         * @param clientId The client calling finishProxyOperation

         * @param superImpl The "standard" implementation to potentially call

         */

        void finishProxyOperation(int code, @NonNull AttributionSource attributionSource,

        void finishProxyOperation(@NonNull IBinder clientId, int code,

                @NonNull AttributionSource attributionSource,

                boolean skipProxyOperation,

                @NonNull TriFunction<Integer, AttributionSource, Boolean, Void> superImpl);

                @NonNull QuadFunction<IBinder, Integer, AttributionSource, Boolean,

                        Void> superImpl);

    }



    /**

core/java/com/android/internal/app/IAppOpsService.aidl

+6 −5
Original line number Diff line number Diff line
@@ -58,11 +58,12 @@ interface IAppOpsService { 
    SyncNotedAppOp noteProxyOperation(int code, in AttributionSource attributionSource,

            boolean shouldCollectAsyncNotedOp, String message, boolean shouldCollectMessage,

            boolean skipProxyOperation);

    SyncNotedAppOp startProxyOperation(int code, in AttributionSource attributionSource,

            boolean startIfModeDefault, boolean shouldCollectAsyncNotedOp, String message,

            boolean shouldCollectMessage, boolean skipProxyOperation, int proxyAttributionFlags,

            int proxiedAttributionFlags, int attributionChainId);

    void finishProxyOperation(int code, in AttributionSource attributionSource,

    SyncNotedAppOp startProxyOperation(IBinder clientId, int code,

            in AttributionSource attributionSource, boolean startIfModeDefault,

            boolean shouldCollectAsyncNotedOp, String message, boolean shouldCollectMessage,

            boolean skipProxyOperation, int proxyAttributionFlags, int proxiedAttributionFlags,

            int attributionChainId);

    void finishProxyOperation(IBinder clientId, int code, in AttributionSource attributionSource,

            boolean skipProxyOperation);



    // Remaining methods are only used in Java.

packages/SystemUI/src/com/android/systemui/qs/HeaderPrivacyIconsController.kt

+5 −1
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ import java.util.concurrent.Executor 
import javax.inject.Inject

import com.android.systemui.dagger.qualifiers.Background

import com.android.systemui.dagger.qualifiers.Main

import com.android.systemui.statusbar.policy.DeviceProvisionedController



interface ChipVisibilityListener {

    fun onChipVisibilityRefreshed(visible: Boolean)
@@ -54,7 +55,8 @@ class HeaderPrivacyIconsController @Inject constructor( 
    private val activityStarter: ActivityStarter,

    private val appOpsController: AppOpsController,

    private val broadcastDispatcher: BroadcastDispatcher,

    private val safetyCenterManager: SafetyCenterManager

    private val safetyCenterManager: SafetyCenterManager,

    private val deviceProvisionedController: DeviceProvisionedController

) {



    var chipVisibilityListener: ChipVisibilityListener? = null
@@ -134,6 +136,8 @@ class HeaderPrivacyIconsController @Inject constructor( 


    fun onParentVisible() {

        privacyChip.setOnClickListener {

            // Do not expand dialog while device is not provisioned

            if (!deviceProvisionedController.isDeviceProvisioned) return@setOnClickListener

            // If the privacy chip is visible, it means there were some indicators

            uiEventLogger.log(PrivacyChipEvent.ONGOING_INDICATORS_CHIP_CLICK)

            if (safetyCenterEnabled) {