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

Merge "[Telephony Mainline] Exposed sendOrderedBroadcast" am: 471b839d02

Browse Source 
am: 80a5a3db13

Change-Id: I0726f8853b46571976ae6f634e6a05265105bb3f
This commit is contained in:
Peter Wang
2019-12-02 13:54:51 -08:00
committed by android-build-merger
parent 724e258f1a 80a5a3db13
commit ed6d7e8b6e
5 changed files with 72 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
api/current.txt
View File

@@ -9773,6 +9773,7 @@ package android.content {
method public abstract void sendOrderedBroadcast(@RequiresPermission android.content.Intent, @Nullable String);
method public abstract void sendOrderedBroadcast(@NonNull @RequiresPermission android.content.Intent, @Nullable String, @Nullable android.content.BroadcastReceiver, @Nullable android.os.Handler, int, @Nullable String, @Nullable android.os.Bundle);
method public void sendOrderedBroadcast(@NonNull android.content.Intent, @Nullable String, @Nullable String, @Nullable android.content.BroadcastReceiver, @Nullable android.os.Handler, int, @Nullable String, @Nullable android.os.Bundle);
method public void sendOrderedBroadcast(@NonNull @RequiresPermission android.content.Intent, @Nullable String, @Nullable String, @Nullable android.os.Bundle, @Nullable android.content.BroadcastReceiver, @Nullable android.os.Handler, int, @Nullable String, @Nullable android.os.Bundle);
method @RequiresPermission("android.permission.INTERACT_ACROSS_USERS") public abstract void sendOrderedBroadcastAsUser(@RequiresPermission android.content.Intent, android.os.UserHandle, @Nullable String, android.content.BroadcastReceiver, @Nullable android.os.Handler, int, @Nullable String, @Nullable android.os.Bundle);
method @Deprecated @RequiresPermission(android.Manifest.permission.BROADCAST_STICKY) public abstract void sendStickyBroadcast(@RequiresPermission android.content.Intent);
method @Deprecated @RequiresPermission(allOf={"android.permission.INTERACT_ACROSS_USERS", android.Manifest.permission.BROADCAST_STICKY}) public abstract void sendStickyBroadcastAsUser(@RequiresPermission android.content.Intent, android.os.UserHandle);

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

@@ -1350,6 +1350,18 @@ class ContextImpl extends Context {
initialExtras);
}
@Override
public void sendOrderedBroadcast(Intent intent, String receiverPermission, String receiverAppOp,
Bundle options, BroadcastReceiver resultReceiver, Handler scheduler, int initialCode,
String initialData, @Nullable Bundle initialExtras) {
int intAppOp = AppOpsManager.OP_NONE;
if (!TextUtils.isEmpty(receiverAppOp)) {
intAppOp = AppOpsManager.strOpToOp(receiverAppOp);
}
sendOrderedBroadcastAsUser(intent, getUser(), receiverPermission, intAppOp, options,
resultReceiver, scheduler, initialCode, initialData, initialExtras);
}
@Override
@Deprecated
public void sendStickyBroadcast(Intent intent) {

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

@@ -2436,6 +2436,48 @@ public abstract class Context {
throw new RuntimeException("Not implemented. Must override in a subclass.");
}
/**
* Version of
* {@link #sendOrderedBroadcast(Intent, String, BroadcastReceiver, Handler, int, String,
* Bundle)} that allows you to specify the App Op to enforce restrictions on which receivers
* the broadcast will be sent to as well as supply an optional sending options
*
* <p>See {@link BroadcastReceiver} for more information on Intent broadcasts.
*
* @param intent The Intent to broadcast; all receivers matching this
* Intent will receive the broadcast.
* @param receiverPermission String naming a permissions that
* a receiver must hold in order to receive your broadcast.
* If null, no permission is required.
* @param receiverAppOp The app op associated with the broadcast. If null, no appOp is
* required. If both receiverAppOp and receiverPermission are non-null,
* a receiver must have both of them to
* receive the broadcast
* @param options (optional) Additional sending options, generated from a
* {@link android.app.BroadcastOptions}.
* @param resultReceiver Your own BroadcastReceiver to treat as the final
* receiver of the broadcast.
* @param scheduler A custom Handler with which to schedule the
* resultReceiver callback; if null it will be
* scheduled in the Context's main thread.
* @param initialCode An initial value for the result code. Often
* Activity.RESULT_OK.
* @param initialData An initial value for the result data. Often
* null.
* @param initialExtras An initial value for the result extras. Often
* null.
*
* @see #sendOrderedBroadcast(Intent, String, BroadcastReceiver, Handler, int, String, Bundle)
* @see android.app.BroadcastOptions
*/
public void sendOrderedBroadcast(@RequiresPermission @NonNull Intent intent,
@Nullable String receiverPermission, @Nullable String receiverAppOp,
@Nullable Bundle options, @Nullable BroadcastReceiver resultReceiver,
@Nullable Handler scheduler, int initialCode, @Nullable String initialData,
@Nullable Bundle initialExtras) {
throw new RuntimeException("Not implemented. Must override in a subclass.");
}
/**
* <p>Perform a {@link #sendBroadcast(Intent)} that is "sticky," meaning the
* Intent you are sending stays around after the broadcast is complete,

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

@@ -582,6 +582,16 @@ public class ContextWrapper extends Context {
scheduler, initialCode, initialData, initialExtras);
}
@Override
public void sendOrderedBroadcast(@RequiresPermission @NonNull Intent intent,
@Nullable String receiverPermission, @Nullable String receiverAppOp,
@Nullable Bundle options, @Nullable BroadcastReceiver resultReceiver,
@Nullable Handler scheduler, int initialCode, @Nullable String initialData,
@Nullable Bundle initialExtras) {
mBase.sendOrderedBroadcast(intent, receiverPermission, receiverAppOp, options,
resultReceiver, scheduler, initialCode, initialData, initialExtras);
}
@Override
@Deprecated
public void sendStickyBroadcast(Intent intent) {

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

@@ -469,6 +469,13 @@ public class MockContext extends Context {
throw new UnsupportedOperationException();
}
@Override
public void sendOrderedBroadcast(Intent intent, String receiverPermission, String receiverAppOp,
Bundle options, BroadcastReceiver resultReceiver, Handler scheduler, int initialCode,
String initialData, Bundle initialExtras) {
throw new UnsupportedOperationException();
}
@Override
public void sendStickyBroadcast(Intent intent) {
throw new UnsupportedOperationException();