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

Commit 42578cd6 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 10922969 from d57dc02a to udc-qpr1-release 

Change-Id: I7fcaee43a3d8aa88370deca1ae5b0e985499673d
parents 8d233d41 d57dc02a

services/companion/java/com/android/server/companion/CompanionDeviceManagerService.java

+4 −0
Original line number Diff line number Diff line
@@ -145,6 +145,7 @@ public class CompanionDeviceManagerService extends SystemService { 
            "debug.cdm.cdmservice.removal_time_window";



    private static final long ASSOCIATION_REMOVAL_TIME_WINDOW_DEFAULT = DAYS.toMillis(90);

    private static final int MAX_CN_LENGTH = 500;



    private final ActivityManager mActivityManager;

    private final OnPackageVisibilityChangeListener mOnPackageVisibilityChangeListener;
@@ -688,6 +689,9 @@ public class CompanionDeviceManagerService extends SystemService { 
            String callingPackage = component.getPackageName();

            checkCanCallNotificationApi(callingPackage);

            // TODO: check userId.

            if (component.flattenToString().length() > MAX_CN_LENGTH) {

                throw new IllegalArgumentException("Component name is too long.");

            }

            final long identity = Binder.clearCallingIdentity();

            try {

                return PendingIntent.getActivityAsUser(getContext(),

services/core/java/com/android/server/accounts/AccountManagerService.java

+1 −1
Original line number Diff line number Diff line
@@ -4984,7 +4984,7 @@ public class AccountManagerService 
            p.setDataPosition(0);

            Bundle simulateBundle = p.readBundle();

            p.recycle();

            Intent intent = bundle.getParcelable(AccountManager.KEY_INTENT);

            Intent intent = bundle.getParcelable(AccountManager.KEY_INTENT, Intent.class);

            if (intent != null && intent.getClass() != Intent.class) {

                return false;

            }