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

Commit ebf3a0d5 authored by Chad Brubaker's avatar Chad Brubaker Committed by Android (Google) Code Review
Browse files

Merge changes from topic 'receiver_IA' 

* changes:
  Enforce visibleToInstantApps for receivers
  Only send exposed broadcasts to Instant Apps
parents d9864e25 816c83bf

api/current.txt

+7 −0
Original line number Diff line number Diff line
@@ -8822,7 +8822,9 @@ package android.content { 
    method public abstract deprecated android.graphics.drawable.Drawable peekWallpaper();

    method public void registerComponentCallbacks(android.content.ComponentCallbacks);

    method public abstract android.content.Intent registerReceiver(android.content.BroadcastReceiver, android.content.IntentFilter);

    method public abstract android.content.Intent registerReceiver(android.content.BroadcastReceiver, android.content.IntentFilter, boolean);

    method public abstract android.content.Intent registerReceiver(android.content.BroadcastReceiver, android.content.IntentFilter, java.lang.String, android.os.Handler);

    method public abstract android.content.Intent registerReceiver(android.content.BroadcastReceiver, android.content.IntentFilter, java.lang.String, android.os.Handler, boolean);

    method public abstract deprecated void removeStickyBroadcast(android.content.Intent);

    method public abstract deprecated void removeStickyBroadcastAsUser(android.content.Intent, android.os.UserHandle);

    method public abstract void revokeUriPermission(android.net.Uri, int);
@@ -9011,7 +9013,9 @@ package android.content { 
    method public android.database.sqlite.SQLiteDatabase openOrCreateDatabase(java.lang.String, int, android.database.sqlite.SQLiteDatabase.CursorFactory, android.database.DatabaseErrorHandler);

    method public deprecated android.graphics.drawable.Drawable peekWallpaper();

    method public android.content.Intent registerReceiver(android.content.BroadcastReceiver, android.content.IntentFilter);

    method public android.content.Intent registerReceiver(android.content.BroadcastReceiver, android.content.IntentFilter, boolean);

    method public android.content.Intent registerReceiver(android.content.BroadcastReceiver, android.content.IntentFilter, java.lang.String, android.os.Handler);

    method public android.content.Intent registerReceiver(android.content.BroadcastReceiver, android.content.IntentFilter, java.lang.String, android.os.Handler, boolean);

    method public deprecated void removeStickyBroadcast(android.content.Intent);

    method public deprecated void removeStickyBroadcastAsUser(android.content.Intent, android.os.UserHandle);

    method public void revokeUriPermission(android.net.Uri, int);
@@ -9514,6 +9518,7 @@ package android.content { 
    field public static final int FLAG_RECEIVER_NO_ABORT = 134217728; // 0x8000000

    field public static final int FLAG_RECEIVER_REGISTERED_ONLY = 1073741824; // 0x40000000

    field public static final int FLAG_RECEIVER_REPLACE_PENDING = 536870912; // 0x20000000

    field public static final int FLAG_RECEIVER_VISIBLE_TO_INSTANT_APPS = 2097152; // 0x200000

    field public static final java.lang.String METADATA_DOCK_HOME = "android.dock_home";

    field public static final int URI_ALLOW_UNSAFE = 4; // 0x4

    field public static final int URI_ANDROID_APP_SCHEME = 2; // 0x2
@@ -40494,7 +40499,9 @@ package android.test.mock { 
    method public android.database.sqlite.SQLiteDatabase openOrCreateDatabase(java.lang.String, int, android.database.sqlite.SQLiteDatabase.CursorFactory, android.database.DatabaseErrorHandler);

    method public android.graphics.drawable.Drawable peekWallpaper();

    method public android.content.Intent registerReceiver(android.content.BroadcastReceiver, android.content.IntentFilter);

    method public android.content.Intent registerReceiver(android.content.BroadcastReceiver, android.content.IntentFilter, boolean);

    method public android.content.Intent registerReceiver(android.content.BroadcastReceiver, android.content.IntentFilter, java.lang.String, android.os.Handler);

    method public android.content.Intent registerReceiver(android.content.BroadcastReceiver, android.content.IntentFilter, java.lang.String, android.os.Handler, boolean);

    method public void removeStickyBroadcast(android.content.Intent);

    method public void removeStickyBroadcastAsUser(android.content.Intent, android.os.UserHandle);

    method public void revokeUriPermission(android.net.Uri, int);

api/system-current.txt

+7 −0
Original line number Diff line number Diff line
@@ -9327,7 +9327,9 @@ package android.content { 
    method public abstract deprecated android.graphics.drawable.Drawable peekWallpaper();

    method public void registerComponentCallbacks(android.content.ComponentCallbacks);

    method public abstract android.content.Intent registerReceiver(android.content.BroadcastReceiver, android.content.IntentFilter);

    method public abstract android.content.Intent registerReceiver(android.content.BroadcastReceiver, android.content.IntentFilter, boolean);

    method public abstract android.content.Intent registerReceiver(android.content.BroadcastReceiver, android.content.IntentFilter, java.lang.String, android.os.Handler);

    method public abstract android.content.Intent registerReceiver(android.content.BroadcastReceiver, android.content.IntentFilter, java.lang.String, android.os.Handler, boolean);

    method public abstract deprecated void removeStickyBroadcast(android.content.Intent);

    method public abstract deprecated void removeStickyBroadcastAsUser(android.content.Intent, android.os.UserHandle);

    method public abstract void revokeUriPermission(android.net.Uri, int);
@@ -9530,7 +9532,9 @@ package android.content { 
    method public android.database.sqlite.SQLiteDatabase openOrCreateDatabase(java.lang.String, int, android.database.sqlite.SQLiteDatabase.CursorFactory, android.database.DatabaseErrorHandler);

    method public deprecated android.graphics.drawable.Drawable peekWallpaper();

    method public android.content.Intent registerReceiver(android.content.BroadcastReceiver, android.content.IntentFilter);

    method public android.content.Intent registerReceiver(android.content.BroadcastReceiver, android.content.IntentFilter, boolean);

    method public android.content.Intent registerReceiver(android.content.BroadcastReceiver, android.content.IntentFilter, java.lang.String, android.os.Handler);

    method public android.content.Intent registerReceiver(android.content.BroadcastReceiver, android.content.IntentFilter, java.lang.String, android.os.Handler, boolean);

    method public deprecated void removeStickyBroadcast(android.content.Intent);

    method public deprecated void removeStickyBroadcastAsUser(android.content.Intent, android.os.UserHandle);

    method public void revokeUriPermission(android.net.Uri, int);
@@ -10055,6 +10059,7 @@ package android.content { 
    field public static final int FLAG_RECEIVER_NO_ABORT = 134217728; // 0x8000000

    field public static final int FLAG_RECEIVER_REGISTERED_ONLY = 1073741824; // 0x40000000

    field public static final int FLAG_RECEIVER_REPLACE_PENDING = 536870912; // 0x20000000

    field public static final int FLAG_RECEIVER_VISIBLE_TO_INSTANT_APPS = 2097152; // 0x200000

    field public static final java.lang.String METADATA_DOCK_HOME = "android.dock_home";

    field public static final int URI_ALLOW_UNSAFE = 4; // 0x4

    field public static final int URI_ANDROID_APP_SCHEME = 2; // 0x2
@@ -43935,7 +43940,9 @@ package android.test.mock { 
    method public android.database.sqlite.SQLiteDatabase openOrCreateDatabase(java.lang.String, int, android.database.sqlite.SQLiteDatabase.CursorFactory, android.database.DatabaseErrorHandler);

    method public android.graphics.drawable.Drawable peekWallpaper();

    method public android.content.Intent registerReceiver(android.content.BroadcastReceiver, android.content.IntentFilter);

    method public android.content.Intent registerReceiver(android.content.BroadcastReceiver, android.content.IntentFilter, boolean);

    method public android.content.Intent registerReceiver(android.content.BroadcastReceiver, android.content.IntentFilter, java.lang.String, android.os.Handler);

    method public android.content.Intent registerReceiver(android.content.BroadcastReceiver, android.content.IntentFilter, java.lang.String, android.os.Handler, boolean);

    method public void removeStickyBroadcast(android.content.Intent);

    method public void removeStickyBroadcastAsUser(android.content.Intent, android.os.UserHandle);

    method public void revokeUriPermission(android.net.Uri, int);

api/test-current.txt

+7 −0
Original line number Diff line number Diff line
@@ -8851,7 +8851,9 @@ package android.content { 
    method public abstract deprecated android.graphics.drawable.Drawable peekWallpaper();

    method public void registerComponentCallbacks(android.content.ComponentCallbacks);

    method public abstract android.content.Intent registerReceiver(android.content.BroadcastReceiver, android.content.IntentFilter);

    method public abstract android.content.Intent registerReceiver(android.content.BroadcastReceiver, android.content.IntentFilter, boolean);

    method public abstract android.content.Intent registerReceiver(android.content.BroadcastReceiver, android.content.IntentFilter, java.lang.String, android.os.Handler);

    method public abstract android.content.Intent registerReceiver(android.content.BroadcastReceiver, android.content.IntentFilter, java.lang.String, android.os.Handler, boolean);

    method public abstract deprecated void removeStickyBroadcast(android.content.Intent);

    method public abstract deprecated void removeStickyBroadcastAsUser(android.content.Intent, android.os.UserHandle);

    method public abstract void revokeUriPermission(android.net.Uri, int);
@@ -9041,7 +9043,9 @@ package android.content { 
    method public android.database.sqlite.SQLiteDatabase openOrCreateDatabase(java.lang.String, int, android.database.sqlite.SQLiteDatabase.CursorFactory, android.database.DatabaseErrorHandler);

    method public deprecated android.graphics.drawable.Drawable peekWallpaper();

    method public android.content.Intent registerReceiver(android.content.BroadcastReceiver, android.content.IntentFilter);

    method public android.content.Intent registerReceiver(android.content.BroadcastReceiver, android.content.IntentFilter, boolean);

    method public android.content.Intent registerReceiver(android.content.BroadcastReceiver, android.content.IntentFilter, java.lang.String, android.os.Handler);

    method public android.content.Intent registerReceiver(android.content.BroadcastReceiver, android.content.IntentFilter, java.lang.String, android.os.Handler, boolean);

    method public deprecated void removeStickyBroadcast(android.content.Intent);

    method public deprecated void removeStickyBroadcastAsUser(android.content.Intent, android.os.UserHandle);

    method public void revokeUriPermission(android.net.Uri, int);
@@ -9544,6 +9548,7 @@ package android.content { 
    field public static final int FLAG_RECEIVER_NO_ABORT = 134217728; // 0x8000000

    field public static final int FLAG_RECEIVER_REGISTERED_ONLY = 1073741824; // 0x40000000

    field public static final int FLAG_RECEIVER_REPLACE_PENDING = 536870912; // 0x20000000

    field public static final int FLAG_RECEIVER_VISIBLE_TO_INSTANT_APPS = 2097152; // 0x200000

    field public static final java.lang.String METADATA_DOCK_HOME = "android.dock_home";

    field public static final int URI_ALLOW_UNSAFE = 4; // 0x4

    field public static final int URI_ANDROID_APP_SCHEME = 2; // 0x2
@@ -40684,7 +40689,9 @@ package android.test.mock { 
    method public android.database.sqlite.SQLiteDatabase openOrCreateDatabase(java.lang.String, int, android.database.sqlite.SQLiteDatabase.CursorFactory, android.database.DatabaseErrorHandler);

    method public android.graphics.drawable.Drawable peekWallpaper();

    method public android.content.Intent registerReceiver(android.content.BroadcastReceiver, android.content.IntentFilter);

    method public android.content.Intent registerReceiver(android.content.BroadcastReceiver, android.content.IntentFilter, boolean);

    method public android.content.Intent registerReceiver(android.content.BroadcastReceiver, android.content.IntentFilter, java.lang.String, android.os.Handler);

    method public android.content.Intent registerReceiver(android.content.BroadcastReceiver, android.content.IntentFilter, java.lang.String, android.os.Handler, boolean);

    method public void removeStickyBroadcast(android.content.Intent);

    method public void removeStickyBroadcastAsUser(android.content.Intent, android.os.UserHandle);

    method public void revokeUriPermission(android.net.Uri, int);

core/java/android/app/ContextImpl.java

+17 −4
Original line number Diff line number Diff line
@@ -1325,23 +1325,36 @@ class ContextImpl extends Context { 
        return registerReceiver(receiver, filter, null, null);

    }



    @Override

    public Intent registerReceiver(BroadcastReceiver receiver, IntentFilter filter,

            boolean visibleToInstantApps) {

        return registerReceiver(receiver, filter, null, null, visibleToInstantApps);

    }



    @Override

    public Intent registerReceiver(BroadcastReceiver receiver, IntentFilter filter,

            String broadcastPermission, Handler scheduler) {

        return registerReceiverInternal(receiver, getUserId(),

                filter, broadcastPermission, scheduler, getOuterContext());

                filter, broadcastPermission, scheduler, getOuterContext(), false);

    }



    @Override

    public Intent registerReceiver(BroadcastReceiver receiver, IntentFilter filter,

            String broadcastPermission, Handler scheduler, boolean visibleToInstantApps) {

        return registerReceiverInternal(receiver, getUserId(),

                filter, broadcastPermission, scheduler, getOuterContext(), visibleToInstantApps);

    }



    @Override

    public Intent registerReceiverAsUser(BroadcastReceiver receiver, UserHandle user,

            IntentFilter filter, String broadcastPermission, Handler scheduler) {

        return registerReceiverInternal(receiver, user.getIdentifier(),

                filter, broadcastPermission, scheduler, getOuterContext());

                filter, broadcastPermission, scheduler, getOuterContext(), false);

    }



    private Intent registerReceiverInternal(BroadcastReceiver receiver, int userId,

            IntentFilter filter, String broadcastPermission,

            Handler scheduler, Context context) {

            Handler scheduler, Context context, boolean visibleToInstantApps) {

        IIntentReceiver rd = null;

        if (receiver != null) {

            if (mPackageInfo != null && context != null) {
@@ -1362,7 +1375,7 @@ class ContextImpl extends Context { 
        try {

            final Intent intent = ActivityManager.getService().registerReceiver(

                    mMainThread.getApplicationThread(), mBasePackageName, rd, filter,

                    broadcastPermission, userId);

                    broadcastPermission, userId, visibleToInstantApps);

            if (intent != null) {

                intent.setExtrasClassLoader(getClassLoader());

                intent.prepareToEnterProcess();

core/java/android/app/IActivityManager.aidl

+1 −1
Original line number Diff line number Diff line
@@ -100,7 +100,7 @@ interface IActivityManager { 
    boolean finishActivity(in IBinder token, int code, in Intent data, int finishTask);

    Intent registerReceiver(in IApplicationThread caller, in String callerPackage,

            in IIntentReceiver receiver, in IntentFilter filter,

            in String requiredPermission, int userId);

            in String requiredPermission, int userId, boolean visibleToInstantApps);

    void unregisterReceiver(in IIntentReceiver receiver);

    int broadcastIntent(in IApplicationThread caller, in Intent intent,

            in String resolvedType, in IIntentReceiver resultTo, int resultCode,