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

Commit a59e95a0 authored by Chad Brubaker's avatar Chad Brubaker Committed by android-build-merger
Browse files

Merge "Address API review comments for registerReceiver" into oc-dev am: 1f4e053a 

am: 46f7f1c2

Change-Id: If4167d8458b144a73deeaceeaa51b1f8d482d6d7
parents 85aa374b 46f7f1c2

api/current.txt

+7 −6
Original line number Diff line number Diff line
@@ -8878,9 +8878,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);
@@ -8971,6 +8971,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";
@@ -9070,9 +9071,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);
@@ -40885,9 +40886,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
@@ -9378,9 +9378,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);
@@ -9480,6 +9480,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";
@@ -9585,9 +9586,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);
@@ -44441,9 +44442,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
@@ -8911,9 +8911,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);
@@ -9004,6 +9004,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";
@@ -9104,9 +9105,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);
@@ -41096,9 +41097,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
@@ -1356,34 +1356,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) {
@@ -1404,7 +1404,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,