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

Commit 41d98c44 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 12399922 from 64358d6a to 24Q4-release 

Change-Id: Ibdf10c91152ffeba03cff47990a4ed9218d110ff
parents 9602d7fb 64358d6a

packages/SystemUI/src/com/android/systemui/navigationbar/TaskbarDelegate.java

+6 −0
Original line number Diff line number Diff line
@@ -550,6 +550,12 @@ public class TaskbarDelegate implements CommandQueue.Callbacks, 
        appTransitionPending(true);

    }



    @Override

    public void appTransitionStarting(int displayId, long startTime, long duration,

            boolean forced) {

        appTransitionPending(false);

    }



    @Override

    public void appTransitionCancelled(int displayId) {

        appTransitionPending(false);

services/core/java/com/android/server/appop/AppOpsService.java

+5 −5
Original line number Diff line number Diff line
@@ -619,7 +619,7 @@ public class AppOpsService extends IAppOpsService.Stub { 
            this.op = op;

            this.uid = uid;

            this.uidState = uidState;

            this.packageName = packageName;

            this.packageName = packageName.intern();

            // We keep an invariant that the persistent device will always have an entry in

            // mDeviceAttributedOps.

            mDeviceAttributedOps.put(PERSISTENT_DEVICE_ID_DEFAULT,
@@ -1031,7 +1031,7 @@ public class AppOpsService extends IAppOpsService.Stub { 
        @Override

        public void onReceive(Context context, Intent intent) {

            String action = intent.getAction();

            String pkgName = intent.getData().getEncodedSchemeSpecificPart();

            String pkgName = intent.getData().getEncodedSchemeSpecificPart().intern();

            int uid = intent.getIntExtra(Intent.EXTRA_UID, Process.INVALID_UID);



            if (action.equals(ACTION_PACKAGE_ADDED)
@@ -1235,7 +1235,7 @@ public class AppOpsService extends IAppOpsService.Stub { 
        Ops ops = uidState.pkgOps.get(packageName);

        if (ops == null) {

            ops = new Ops(packageName, uidState);

            uidState.pkgOps.put(packageName, ops);

            uidState.pkgOps.put(packageName.intern(), ops);

        }



        SparseIntArray packageModes =
@@ -4739,7 +4739,7 @@ public class AppOpsService extends IAppOpsService.Stub { 
                return null;

            }

            ops = new Ops(packageName, uidState);

            uidState.pkgOps.put(packageName, ops);

            uidState.pkgOps.put(packageName.intern(), ops);

        }



        if (edit) {
@@ -5076,7 +5076,7 @@ public class AppOpsService extends IAppOpsService.Stub { 
        Ops ops = uidState.pkgOps.get(pkgName);

        if (ops == null) {

            ops = new Ops(pkgName, uidState);

            uidState.pkgOps.put(pkgName, ops);

            uidState.pkgOps.put(pkgName.intern(), ops);

        }

        ops.put(op.op, op);

    }

tests/FlickerTests/ActivityEmbedding/OWNERS

0 → 100644
+1 −0
Original line number Diff line number Diff line 
# Bug component: 1168918