Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Adding support for FLAG_EXPORTED and FLAG_NOT_EXPORTED to

Browse Source 
registerReceiverAsUser and registerReceiverForAllUsers

Test: not needed, added an override method. Manually tested
Bug: 161145287
CTS-Coverage-Bug: 197772228
Change-Id: I2c8220c8d54b9ec5cb9481cef98735395db76e27
Topic: registerReceiverAsUser
This commit is contained in:
Jacob Hobbie
2021-09-01 13:11:49 -07:00
parent 74217efdd3
commit bd012f4109
5 changed files with 121 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/api/system-current.txt
View File

@@ -2319,6 +2319,7 @@ package android.content {
method @Nullable public abstract java.io.File getPreloadsFileCache();
method public abstract boolean isCredentialProtectedStorage();
method @Nullable @RequiresPermission(android.Manifest.permission.INTERACT_ACROSS_USERS_FULL) public android.content.Intent registerReceiverForAllUsers(@Nullable android.content.BroadcastReceiver, @NonNull android.content.IntentFilter, @Nullable String, @Nullable android.os.Handler);
method @Nullable @RequiresPermission(android.Manifest.permission.INTERACT_ACROSS_USERS_FULL) public android.content.Intent registerReceiverForAllUsers(@Nullable android.content.BroadcastReceiver, @NonNull android.content.IntentFilter, @Nullable String, @Nullable android.os.Handler, int);
method public abstract void sendBroadcast(android.content.Intent, @Nullable String, @Nullable android.os.Bundle);
method @RequiresPermission(android.Manifest.permission.INTERACT_ACROSS_USERS) public abstract void sendBroadcastAsUser(@RequiresPermission android.content.Intent, android.os.UserHandle, @Nullable String, @Nullable android.os.Bundle);
method public abstract void sendOrderedBroadcast(@NonNull android.content.Intent, @Nullable String, @Nullable android.os.Bundle, @Nullable android.content.BroadcastReceiver, @Nullable android.os.Handler, int, @Nullable String, @Nullable android.os.Bundle);

14
core/java/android/app/ContextImpl.java
View File

@@ -1738,6 +1738,13 @@ class ContextImpl extends Context {
filter, broadcastPermission, scheduler);
}
@Override
public Intent registerReceiverForAllUsers(BroadcastReceiver receiver,
IntentFilter filter, String broadcastPermission, Handler scheduler, int flags) {
return registerReceiverAsUser(receiver, UserHandle.ALL,
filter, broadcastPermission, scheduler, flags);
}
@Override
public Intent registerReceiverAsUser(BroadcastReceiver receiver, UserHandle user,
IntentFilter filter, String broadcastPermission, Handler scheduler) {
@@ -1745,6 +1752,13 @@ class ContextImpl extends Context {
filter, broadcastPermission, scheduler, getOuterContext(), 0);
}
@Override
public Intent registerReceiverAsUser(BroadcastReceiver receiver, UserHandle user,
IntentFilter filter, String broadcastPermission, Handler scheduler, int flags) {
return registerReceiverInternal(receiver, user.getIdentifier(),
filter, broadcastPermission, scheduler, getOuterContext(), flags);
}
private Intent registerReceiverInternal(BroadcastReceiver receiver, int userId,
IntentFilter filter, String broadcastPermission,
Handler scheduler, Context context, int flags) {

71
core/java/android/content/Context.java
View File

@@ -3129,6 +3129,42 @@ public abstract class Context {
throw new RuntimeException("Not implemented. Must override in a subclass.");
}
/**
* Same as {@link #registerReceiver(BroadcastReceiver, IntentFilter, String, Handler, int)}
* but this receiver will receive broadcasts that are sent to all users. The receiver can
* use {@link BroadcastReceiver#getSendingUser} to determine on which user the broadcast
* was sent.
*
* @param receiver The BroadcastReceiver to handle the broadcast.
* @param filter Selects the Intent broadcasts to be received.
* @param broadcastPermission String naming a permissions that a
* broadcaster must hold in order to send an Intent to you. If {@code null},
* no permission is required.
* @param scheduler Handler identifying the thread that will receive
* the Intent. If {@code null}, the main thread of the process will be used.
* @param flags Additional options for the receiver. As of
* {@link android.os.Build.VERSION_CODES#TIRAMISU}, either {@link #RECEIVER_EXPORTED} or
* {@link #RECEIVER_NOT_EXPORTED} must be specified if the receiver isn't being
* registered for protected broadcasts
*
* @return The first sticky intent found that matches <var>filter</var>,
* or {@code null} if there are none.
*
* @see #registerReceiver(BroadcastReceiver, IntentFilter, String, Handler, int)
* @see #sendBroadcast
* @see #unregisterReceiver
* @hide
*/
@SuppressLint("IntentBuilderName")
@Nullable
@RequiresPermission(android.Manifest.permission.INTERACT_ACROSS_USERS_FULL)
@SystemApi
public Intent registerReceiverForAllUsers(@Nullable BroadcastReceiver receiver,
@NonNull IntentFilter filter, @Nullable String broadcastPermission,
@Nullable Handler scheduler, @RegisterReceiverFlags int flags) {
throw new RuntimeException("Not implemented. Must override in a subclass.");
}
/**
* @hide
* Same as {@link #registerReceiver(BroadcastReceiver, IntentFilter, String, Handler)
@@ -3159,6 +3195,41 @@ public abstract class Context {
UserHandle user, IntentFilter filter, @Nullable String broadcastPermission,
@Nullable Handler scheduler);
/**
* @hide
* Same as {@link #registerReceiver(BroadcastReceiver, IntentFilter, String, Handler, int)
* but for a specific user. This receiver will receiver broadcasts that
* are sent to the requested user.
*
* @param receiver The BroadcastReceiver to handle the broadcast.
* @param user UserHandle to send the intent to.
* @param filter Selects the Intent broadcasts to be received.
* @param broadcastPermission String naming a permissions that a
* broadcaster must hold in order to send an Intent to you. If null,
* no permission is required.
* @param scheduler Handler identifying the thread that will receive
* the Intent. If null, the main thread of the process will be used.
* @param flags Additional options for the receiver. As of
* {@link android.os.Build.VERSION_CODES#TIRAMISU}, either {@link #RECEIVER_EXPORTED} or
* {@link #RECEIVER_NOT_EXPORTED} must be specified if the receiver isn't being
* registered for protected broadcasts
*
* @return The first sticky intent found that matches <var>filter</var>,
* or null if there are none.
*
* @see #registerReceiver(BroadcastReceiver, IntentFilter, String, Handler, int)
* @see #sendBroadcast
* @see #unregisterReceiver
*/
@SuppressWarnings("HiddenAbstractMethod")
@SuppressLint("IntentBuilderName")
@Nullable
@RequiresPermission(android.Manifest.permission.INTERACT_ACROSS_USERS_FULL)
@UnsupportedAppUsage
public abstract Intent registerReceiverAsUser(BroadcastReceiver receiver,
UserHandle user, IntentFilter filter, @Nullable String broadcastPermission,
@Nullable Handler scheduler, @RegisterReceiverFlags int flags);
/**
* Unregister a previously registered BroadcastReceiver. <em>All</em>
* filters that have been registered for this BroadcastReceiver will be

20
core/java/android/content/ContextWrapper.java
View File

@@ -754,6 +754,16 @@ public class ContextWrapper extends Context {
scheduler);
}
/** @hide */
@Override
@Nullable
public Intent registerReceiverForAllUsers(@Nullable BroadcastReceiver receiver,
@NonNull IntentFilter filter, @Nullable String broadcastPermission,
@Nullable Handler scheduler, int flags) {
return mBase.registerReceiverForAllUsers(receiver, filter, broadcastPermission,
scheduler, flags);
}
/** @hide */
@Override
@UnsupportedAppUsage
@@ -764,6 +774,16 @@ public class ContextWrapper extends Context {
scheduler);
}
/** @hide */
@Override
@UnsupportedAppUsage
public Intent registerReceiverAsUser(@Nullable BroadcastReceiver receiver, UserHandle user,
IntentFilter filter, @Nullable String broadcastPermission,
@Nullable Handler scheduler, int flags) {
return mBase.registerReceiverAsUser(receiver, user, filter, broadcastPermission,
scheduler, flags);
}
@Override
public void unregisterReceiver(BroadcastReceiver receiver) {
mBase.unregisterReceiver(receiver);

15
test-mock/src/android/test/mock/MockContext.java
View File

@@ -571,6 +571,14 @@ public class MockContext extends Context {
throw new UnsupportedOperationException();
}
/** @hide */
@Override
@SystemApi
public Intent registerReceiverForAllUsers(BroadcastReceiver receiver,
IntentFilter filter, String broadcastPermission, Handler scheduler, int flags) {
throw new UnsupportedOperationException();
}
/** @hide */
@Override
public Intent registerReceiverAsUser(BroadcastReceiver receiver, UserHandle user,
@@ -578,6 +586,13 @@ public class MockContext extends Context {
throw new UnsupportedOperationException();
}
/** @hide */
@Override
public Intent registerReceiverAsUser(BroadcastReceiver receiver, UserHandle user,
IntentFilter filter, String broadcastPermission, Handler scheduler, int flags) {
throw new UnsupportedOperationException();
}
@Override
public void unregisterReceiver(BroadcastReceiver receiver) {
throw new UnsupportedOperationException();