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

Commit f5e10714 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Flush addPersistentPreferredActivity setting in DPMS"

parents e1748fa3 28863986

services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java

+2 −0
Original line number Original line Diff line number Diff line
@@ -7211,6 +7211,7 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { 
            long id = mInjector.binderClearCallingIdentity();

            long id = mInjector.binderClearCallingIdentity();

            try {

            try {

                mIPackageManager.addPersistentPreferredActivity(filter, activity, userHandle);

                mIPackageManager.addPersistentPreferredActivity(filter, activity, userHandle);

                mIPackageManager.flushPackageRestrictionsAsUser(userHandle);

            } catch (RemoteException re) {

            } catch (RemoteException re) {

                // Shouldn't happen

                // Shouldn't happen

            } finally {

            } finally {
@@ -7229,6 +7230,7 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { 
            long id = mInjector.binderClearCallingIdentity();

            long id = mInjector.binderClearCallingIdentity();

            try {

            try {

                mIPackageManager.clearPackagePersistentPreferredActivities(packageName, userHandle);

                mIPackageManager.clearPackagePersistentPreferredActivities(packageName, userHandle);

                mIPackageManager.flushPackageRestrictionsAsUser(userHandle);

            } catch (RemoteException re) {

            } catch (RemoteException re) {

                // Shouldn't happen

                // Shouldn't happen

            } finally {

            } finally {