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

Merge "[API Review] Expose sendOrderedBroadcast" am: b0157c3ee3

Browse Source 
Change-Id: I686308c2af6e31a30c211d25adea416d556e5cd1
This commit is contained in:
Automerger Merge Worker
2020-03-02 21:59:55 +00:00
parent 5a935b209f b0157c3ee3
commit f1124753ed
5 changed files with 19 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
api/current.txt
View File

@@ -9775,7 +9775,6 @@ 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);
@@ -9980,6 +9979,7 @@ package android.content {
method public void sendBroadcastAsUser(android.content.Intent, android.os.UserHandle, String);
method public void sendOrderedBroadcast(android.content.Intent, String);
method public void sendOrderedBroadcast(android.content.Intent, String, android.content.BroadcastReceiver, android.os.Handler, int, String, android.os.Bundle);
method public void sendOrderedBroadcast(@NonNull @RequiresPermission android.content.Intent, int, @Nullable String, @Nullable String, @Nullable android.content.BroadcastReceiver, @Nullable android.os.Handler, @Nullable String, @Nullable android.os.Bundle, @Nullable android.os.Bundle);
method public void sendOrderedBroadcastAsUser(android.content.Intent, android.os.UserHandle, String, android.content.BroadcastReceiver, android.os.Handler, int, String, android.os.Bundle);
method @Deprecated public void sendStickyBroadcast(android.content.Intent);
method @Deprecated public void sendStickyBroadcastAsUser(android.content.Intent, android.os.UserHandle);

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

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

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

@@ -2470,12 +2470,13 @@ public abstract class Context {
*
* @see #sendOrderedBroadcast(Intent, String, BroadcastReceiver, Handler, int, String, Bundle)
* @see android.app.BroadcastOptions
* @hide
*/
public void sendOrderedBroadcast(@RequiresPermission @NonNull Intent intent,
public void sendOrderedBroadcast(@RequiresPermission @NonNull Intent intent, int initialCode,
@Nullable String receiverPermission, @Nullable String receiverAppOp,
@Nullable Bundle options, @Nullable BroadcastReceiver resultReceiver,
@Nullable Handler scheduler, int initialCode, @Nullable String initialData,
@Nullable Bundle initialExtras) {
@Nullable BroadcastReceiver resultReceiver, @Nullable Handler scheduler,
@Nullable String initialData, @Nullable Bundle initialExtras,
@Nullable Bundle options) {
throw new RuntimeException("Not implemented. Must override in a subclass.");
}

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

@@ -583,13 +583,13 @@ public class ContextWrapper extends Context {
}
@Override
public void sendOrderedBroadcast(@RequiresPermission @NonNull Intent intent,
public void sendOrderedBroadcast(@RequiresPermission @NonNull Intent intent, int initialCode,
@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);
@Nullable BroadcastReceiver resultReceiver, @Nullable Handler scheduler,
@Nullable String initialData, @Nullable Bundle initialExtras,
@Nullable Bundle options) {
mBase.sendOrderedBroadcast(intent, initialCode, receiverPermission, receiverAppOp,
resultReceiver, scheduler, initialData, initialExtras, options);
}
@Override

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

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