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

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

Merge "Address API review comments for registerReceiver" into oc-dev

parents 4e45b149 6d6015f6

api/current.txt

+7 −6
Original line number Diff line number Diff line
@@ -8876,9 +8876,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, int);

    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 android.content.Intent registerReceiver(android.content.BroadcastReceiver, android.content.IntentFilter, java.lang.String, android.os.Handler, int);

    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);
@@ -8969,6 +8969,7 @@ package android.content { 
    field public static final java.lang.String NSD_SERVICE = "servicediscovery";

    field public static final java.lang.String POWER_SERVICE = "power";

    field public static final java.lang.String PRINT_SERVICE = "print";

    field public static final int RECEIVER_VISIBLE_TO_INSTANT_APPS = 1; // 0x1

    field public static final java.lang.String RESTRICTIONS_SERVICE = "restrictions";

    field public static final java.lang.String SEARCH_SERVICE = "search";

    field public static final java.lang.String SENSOR_SERVICE = "sensor";
@@ -9068,9 +9069,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, int);

    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 android.content.Intent registerReceiver(android.content.BroadcastReceiver, android.content.IntentFilter, java.lang.String, android.os.Handler, int);

    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);
@@ -40881,9 +40882,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, int);

    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 android.content.Intent registerReceiver(android.content.BroadcastReceiver, android.content.IntentFilter, java.lang.String, android.os.Handler, int);

    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 −6
Original line number Diff line number Diff line
@@ -9376,9 +9376,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, int);

    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 android.content.Intent registerReceiver(android.content.BroadcastReceiver, android.content.IntentFilter, java.lang.String, android.os.Handler, int);

    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);
@@ -9478,6 +9478,7 @@ package android.content { 
    field public static final java.lang.String PERSISTENT_DATA_BLOCK_SERVICE = "persistent_data_block";

    field public static final java.lang.String POWER_SERVICE = "power";

    field public static final java.lang.String PRINT_SERVICE = "print";

    field public static final int RECEIVER_VISIBLE_TO_INSTANT_APPS = 1; // 0x1

    field public static final java.lang.String RESTRICTIONS_SERVICE = "restrictions";

    field public static final java.lang.String SEARCH_SERVICE = "search";

    field public static final java.lang.String SENSOR_SERVICE = "sensor";
@@ -9583,9 +9584,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, int);

    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 android.content.Intent registerReceiver(android.content.BroadcastReceiver, android.content.IntentFilter, java.lang.String, android.os.Handler, int);

    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);
@@ -44437,9 +44438,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, int);

    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 android.content.Intent registerReceiver(android.content.BroadcastReceiver, android.content.IntentFilter, java.lang.String, android.os.Handler, int);

    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 −6
Original line number Diff line number Diff line
@@ -8909,9 +8909,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, int);

    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 android.content.Intent registerReceiver(android.content.BroadcastReceiver, android.content.IntentFilter, java.lang.String, android.os.Handler, int);

    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);
@@ -9002,6 +9002,7 @@ package android.content { 
    field public static final java.lang.String NSD_SERVICE = "servicediscovery";

    field public static final java.lang.String POWER_SERVICE = "power";

    field public static final java.lang.String PRINT_SERVICE = "print";

    field public static final int RECEIVER_VISIBLE_TO_INSTANT_APPS = 1; // 0x1

    field public static final java.lang.String RESTRICTIONS_SERVICE = "restrictions";

    field public static final java.lang.String SEARCH_SERVICE = "search";

    field public static final java.lang.String SENSOR_SERVICE = "sensor";
@@ -9102,9 +9103,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, int);

    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 android.content.Intent registerReceiver(android.content.BroadcastReceiver, android.content.IntentFilter, java.lang.String, android.os.Handler, int);

    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);
@@ -41076,9 +41077,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, int);

    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 android.content.Intent registerReceiver(android.content.BroadcastReceiver, android.content.IntentFilter, java.lang.String, android.os.Handler, int);

    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

+8 −8
Original line number Diff line number Diff line
@@ -1357,34 +1357,34 @@ class ContextImpl extends Context { 


    @Override

    public Intent registerReceiver(BroadcastReceiver receiver, IntentFilter filter,

            boolean visibleToInstantApps) {

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

            int flags) {

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

    }



    @Override

    public Intent registerReceiver(BroadcastReceiver receiver, IntentFilter filter,

            String broadcastPermission, Handler scheduler) {

        return registerReceiverInternal(receiver, getUserId(),

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

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

    }



    @Override

    public Intent registerReceiver(BroadcastReceiver receiver, IntentFilter filter,

            String broadcastPermission, Handler scheduler, boolean visibleToInstantApps) {

            String broadcastPermission, Handler scheduler, int flags) {

        return registerReceiverInternal(receiver, getUserId(),

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

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

    }



    @Override

    public Intent registerReceiverAsUser(BroadcastReceiver receiver, UserHandle user,

            IntentFilter filter, String broadcastPermission, Handler scheduler) {

        return registerReceiverInternal(receiver, user.getIdentifier(),

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

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

    }



    private Intent registerReceiverInternal(BroadcastReceiver receiver, int userId,

            IntentFilter filter, String broadcastPermission,

            Handler scheduler, Context context, boolean visibleToInstantApps) {

            Handler scheduler, Context context, int flags) {

        IIntentReceiver rd = null;

        if (receiver != null) {

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

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

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

                    broadcastPermission, userId, visibleToInstantApps);

                    broadcastPermission, userId, flags);

            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, boolean visibleToInstantApps);

            in String requiredPermission, int userId, int flags);

    void unregisterReceiver(in IIntentReceiver receiver);

    int broadcastIntent(in IApplicationThread caller, in Intent intent,

            in String resolvedType, in IIntentReceiver resultTo, int resultCode,