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

Commit 20e80987 authored by Dianne Hackborn's avatar Dianne Hackborn
Browse files

Add registering for explicit users. 

New API to register as an explicit user, which allows you to
also select ALL to see broadcasts for all users.

New BroadcastReceiver API to find out which user the broadcast
was sent to.

Use this in app widget service to handle per-user package broadcasts
and boot completed broadcasts correctly.

Change-Id: Ibbe28993bd4aa93900c79e412026c27863019eb8
parent 2701f325

core/java/android/app/ActivityManagerNative.java

+4 −2
Original line number Diff line number Diff line
@@ -300,7 +300,8 @@ public abstract class ActivityManagerNative extends Binder implements IActivityM 
                = b != null ? IIntentReceiver.Stub.asInterface(b) : null;

            IntentFilter filter = IntentFilter.CREATOR.createFromParcel(data);

            String perm = data.readString();

            Intent intent = registerReceiver(app, packageName, rec, filter, perm);

            int userId = data.readInt();

            Intent intent = registerReceiver(app, packageName, rec, filter, perm, userId);

            reply.writeNoException();

            if (intent != null) {

                reply.writeInt(1);
@@ -1999,7 +2000,7 @@ class ActivityManagerProxy implements IActivityManager 
    }

    public Intent registerReceiver(IApplicationThread caller, String packageName,

            IIntentReceiver receiver,

            IntentFilter filter, String perm) throws RemoteException

            IntentFilter filter, String perm, int userId) throws RemoteException

    {

        Parcel data = Parcel.obtain();

        Parcel reply = Parcel.obtain();
@@ -2009,6 +2010,7 @@ class ActivityManagerProxy implements IActivityManager 
        data.writeStrongBinder(receiver != null ? receiver.asBinder() : null);

        filter.writeToParcel(data, 0);

        data.writeString(perm);

        data.writeInt(userId);

        mRemote.transact(REGISTER_RECEIVER_TRANSACTION, data, reply, 0);

        reply.readException();

        Intent intent = null;

core/java/android/app/ActivityThread.java

+8 −6
Original line number Diff line number Diff line
@@ -320,8 +320,9 @@ public final class ActivityThread { 


    static final class ReceiverData extends BroadcastReceiver.PendingResult {

        public ReceiverData(Intent intent, int resultCode, String resultData, Bundle resultExtras,

                boolean ordered, boolean sticky, IBinder token) {

            super(resultCode, resultData, resultExtras, TYPE_COMPONENT, ordered, sticky, token);

                boolean ordered, boolean sticky, IBinder token, int sendingUser) {

            super(resultCode, resultData, resultExtras, TYPE_COMPONENT, ordered, sticky,

                    token, sendingUser);

            this.intent = intent;

        }
@@ -613,9 +614,9 @@ public final class ActivityThread { 


        public final void scheduleReceiver(Intent intent, ActivityInfo info,

                CompatibilityInfo compatInfo, int resultCode, String data, Bundle extras,

                boolean sync) {

                boolean sync, int sendingUser) {

            ReceiverData r = new ReceiverData(intent, resultCode, data, extras,

                    sync, false, mAppThread.asBinder());

                    sync, false, mAppThread.asBinder(), sendingUser);

            r.info = info;

            r.compatInfo = compatInfo;

            queueOrSendMessage(H.RECEIVER, r);
@@ -774,8 +775,9 @@ public final class ActivityThread { 
        // applies transaction ordering per object for such calls.

        public void scheduleRegisteredReceiver(IIntentReceiver receiver, Intent intent,

                int resultCode, String dataStr, Bundle extras, boolean ordered,

                boolean sticky) throws RemoteException {

            receiver.performReceive(intent, resultCode, dataStr, extras, ordered, sticky);

                boolean sticky, int sendingUser) throws RemoteException {

            receiver.performReceive(intent, resultCode, dataStr, extras, ordered,

                    sticky, sendingUser);

        }



        public void scheduleLowMemory() {

core/java/android/app/ApplicationThreadNative.java

+9 −5
Original line number Diff line number Diff line
@@ -193,8 +193,9 @@ public abstract class ApplicationThreadNative extends Binder 
            String resultData = data.readString();

            Bundle resultExtras = data.readBundle();

            boolean sync = data.readInt() != 0;

            int sendingUser = data.readInt();

            scheduleReceiver(intent, info, compatInfo, resultCode, resultData,

                    resultExtras, sync);

                    resultExtras, sync, sendingUser);

            return true;

        }
@@ -378,8 +379,9 @@ public abstract class ApplicationThreadNative extends Binder 
            Bundle extras = data.readBundle();

            boolean ordered = data.readInt() != 0;

            boolean sticky = data.readInt() != 0;

            int sendingUser = data.readInt();

            scheduleRegisteredReceiver(receiver, intent,

                    resultCode, dataStr, extras, ordered, sticky);

                    resultCode, dataStr, extras, ordered, sticky, sendingUser);

            return true;

        }
@@ -755,7 +757,7 @@ class ApplicationThreadProxy implements IApplicationThread { 
    

    public final void scheduleReceiver(Intent intent, ActivityInfo info,

            CompatibilityInfo compatInfo, int resultCode, String resultData,

            Bundle map, boolean sync) throws RemoteException {

            Bundle map, boolean sync, int sendingUser) throws RemoteException {

        Parcel data = Parcel.obtain();

        data.writeInterfaceToken(IApplicationThread.descriptor);

        intent.writeToParcel(data, 0);
@@ -765,6 +767,7 @@ class ApplicationThreadProxy implements IApplicationThread { 
        data.writeString(resultData);

        data.writeBundle(map);

        data.writeInt(sync ? 1 : 0);

        data.writeInt(sendingUser);

        mRemote.transact(SCHEDULE_RECEIVER_TRANSACTION, data, null,

                IBinder.FLAG_ONEWAY);

        data.recycle();
@@ -991,8 +994,8 @@ class ApplicationThreadProxy implements IApplicationThread { 
    }



    public void scheduleRegisteredReceiver(IIntentReceiver receiver, Intent intent,

            int resultCode, String dataStr, Bundle extras, boolean ordered, boolean sticky)

            throws RemoteException {

            int resultCode, String dataStr, Bundle extras, boolean ordered,

            boolean sticky, int sendingUser) throws RemoteException {

        Parcel data = Parcel.obtain();

        data.writeInterfaceToken(IApplicationThread.descriptor);

        data.writeStrongBinder(receiver.asBinder());
@@ -1002,6 +1005,7 @@ class ApplicationThreadProxy implements IApplicationThread { 
        data.writeBundle(extras);

        data.writeInt(ordered ? 1 : 0);

        data.writeInt(sticky ? 1 : 0);

        data.writeInt(sendingUser);

        mRemote.transact(SCHEDULE_REGISTERED_RECEIVER_TRANSACTION, data, null,

                IBinder.FLAG_ONEWAY);

        data.recycle();

core/java/android/app/ContextImpl.java

+22 −4
Original line number Diff line number Diff line
@@ -137,6 +137,17 @@ class ReceiverRestrictedContext extends ContextWrapper { 
        //        scheduler);

    }



    @Override

    public Intent registerReceiverAsUser(BroadcastReceiver receiver, UserHandle user,

            IntentFilter filter, String broadcastPermission, Handler scheduler) {

        throw new ReceiverCallNotAllowedException(

                "IntentReceiver components are not allowed to register to receive intents");

        //ex.fillInStackTrace();

        //Log.e("IntentReceiver", ex.getMessage(), ex);

        //return mContext.registerReceiver(receiver, filter, broadcastPermission,

        //        scheduler);

    }



    @Override

    public boolean bindService(Intent service, ServiceConnection conn, int flags) {

        throw new ReceiverCallNotAllowedException(
@@ -1252,11 +1263,18 @@ class ContextImpl extends Context { 
    @Override

    public Intent registerReceiver(BroadcastReceiver receiver, IntentFilter filter,

            String broadcastPermission, Handler scheduler) {

        return registerReceiverInternal(receiver, filter, broadcastPermission,

                scheduler, getOuterContext());

        return registerReceiverInternal(receiver, UserHandle.myUserId(),

                filter, broadcastPermission, scheduler, getOuterContext());

    }



    @Override

    public Intent registerReceiverAsUser(BroadcastReceiver receiver, UserHandle user,

            IntentFilter filter, String broadcastPermission, Handler scheduler) {

        return registerReceiverInternal(receiver, user.getIdentifier(),

                filter, broadcastPermission, scheduler, getOuterContext());

    }



    private Intent registerReceiverInternal(BroadcastReceiver receiver,

    private Intent registerReceiverInternal(BroadcastReceiver receiver, int userId,

            IntentFilter filter, String broadcastPermission,

            Handler scheduler, Context context) {

        IIntentReceiver rd = null;
@@ -1279,7 +1297,7 @@ class ContextImpl extends Context { 
        try {

            return ActivityManagerNative.getDefault().registerReceiver(

                    mMainThread.getApplicationThread(), mBasePackageName,

                    rd, filter, broadcastPermission);

                    rd, filter, broadcastPermission, userId);

        } catch (RemoteException e) {

            return null;

        }

core/java/android/app/IActivityManager.java

+1 −1
Original line number Diff line number Diff line
@@ -80,7 +80,7 @@ public interface IActivityManager extends IInterface { 
    public boolean willActivityBeVisible(IBinder token) throws RemoteException;

    public Intent registerReceiver(IApplicationThread caller, String callerPackage,

            IIntentReceiver receiver, IntentFilter filter,

            String requiredPermission) throws RemoteException;

            String requiredPermission, int userId) throws RemoteException;

    public void unregisterReceiver(IIntentReceiver receiver) throws RemoteException;

    public int broadcastIntent(IApplicationThread caller, Intent intent,

            String resolvedType, IIntentReceiver resultTo, int resultCode,