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

Commit 39a6834c authored by Wale Ogunwale's avatar Wale Ogunwale Committed by Android (Google) Code Review
Browse files

Merge "Introducing PendingIntentController (17/n)"

parents 63c6be63 ee6eca1c

core/java/android/app/ActivityManagerInternal.java

+13 −0
Original line number Diff line number Diff line
@@ -19,11 +19,14 @@ package android.app; 
import android.annotation.NonNull;

import android.annotation.Nullable;

import android.content.ComponentName;

import android.content.IIntentReceiver;

import android.content.IIntentSender;

import android.content.Intent;

import android.content.pm.ApplicationInfo;

import android.content.pm.UserInfo;

import android.os.Bundle;

import android.os.IBinder;

import android.os.TransactionTooLargeException;

import android.view.RemoteAnimationAdapter;



import java.util.ArrayList;
@@ -232,4 +235,14 @@ public abstract class ActivityManagerInternal { 
    public abstract void setBooted(boolean booted);

    public abstract boolean isBooted();

    public abstract void finishBooting();



    public abstract void tempWhitelistForPendingIntent(int callerPid, int callerUid, int targetUid,

            long duration, String tag);

    public abstract int broadcastIntentInPackage(String packageName, int uid, Intent intent,

            String resolvedType, IIntentReceiver resultTo, int resultCode, String resultData,

            Bundle resultExtras, String requiredPermission, Bundle bOptions, boolean serialized,

            boolean sticky, int userId);

    public abstract ComponentName startServiceInPackage(int uid, Intent service,

            String resolvedType, boolean fgRequired, String callingPackage, int userId)

            throws TransactionTooLargeException;

}

services/core/java/com/android/server/am/ActiveServices.java

+1 −1
Original line number Diff line number Diff line
@@ -629,7 +629,7 @@ public final class ActiveServices { 
                return false;

            }



            IIntentSender target = mAm.getIntentSenderLocked(

            IIntentSender target = mAm.mPendingIntentController.getIntentSender(

                    ActivityManager.INTENT_SENDER_SERVICE, callingPackage,

                    callingUid, userId, null, null, 0, new Intent[]{service},

                    new String[]{service.resolveType(mAm.mContext.getContentResolver())},

services/core/java/com/android/server/am/ActivityManagerService.java

+58 −268

File changed.

Preview size limit exceeded, changes collapsed.

services/core/java/com/android/server/am/ActivityStack.java

+1 −1
Original line number Diff line number Diff line
@@ -4144,7 +4144,7 @@ class ActivityStack<T extends StackWindowController> extends ConfigurationContai 
            for (WeakReference<PendingIntentRecord> apr : r.pendingResults) {

                PendingIntentRecord rec = apr.get();

                if (rec != null) {

                    mService.mAm.cancelIntentSenderLocked(rec, false);

                    mService.mPendingIntentController.cancelIntentSender(rec, false);

                }

            }

            r.pendingResults = null;

services/core/java/com/android/server/am/ActivityStartInterceptor.java

+1 −1
Original line number Diff line number Diff line
@@ -126,7 +126,7 @@ class ActivityStartInterceptor { 


    private IntentSender createIntentSenderForOriginalIntent(int callingUid, int flags) {

        Bundle activityOptions = deferCrossProfileAppsAnimationIfNecessary();

        final IIntentSender target = mService.mAm.getIntentSenderLocked(

        final IIntentSender target = mService.getIntentSenderLocked(

                INTENT_SENDER_ACTIVITY, mCallingPackage, callingUid, mUserId, null /*token*/,

                null /*resultCode*/, 0 /*requestCode*/,

                new Intent[] { mIntent }, new String[] { mResolvedType },