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

Commit 816c83bf authored by Chad Brubaker's avatar Chad Brubaker
Browse files

Enforce visibleToInstantApps for receivers 

Instant apps can only send broadcasts to receivers that are declared in
the manifest with android:visibleToInstantApps=true or if the app
registers a receiver at runtime using the new methods that take
visibleToInstantApps.

Bug:33350280
Test: Manually sending broadcasts from Instant Apps only goes to
receivers with visibleToInstantApps set to true.
Test: Receiving a broadcast from within the same app does not require
visibleToInstantApps to be set.

Change-Id: I54d79a502ba9c5fd03ede3c09e08afc88fe2775f
parent b7e34d55

api/current.txt

+6 −0
Original line number Diff line number Diff line
@@ -8621,7 +8621,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);
@@ -8810,7 +8812,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);
@@ -40239,7 +40243,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

+6 −0
Original line number Diff line number Diff line
@@ -9115,7 +9115,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);
@@ -9318,7 +9320,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);
@@ -43610,7 +43614,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

+6 −0
Original line number Diff line number Diff line
@@ -8650,7 +8650,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);
@@ -8840,7 +8842,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);
@@ -40425,7 +40429,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,