diff options
| author | 2019-03-06 20:23:45 +0000 | |
|---|---|---|
| committer | 2019-03-06 20:23:45 +0000 | |
| commit | b5e5c908000d9c75993b165eba1eec836c6996f1 (patch) | |
| tree | f4382aeb5b1c095f15339350c44ec48fb4c23f7e | |
| parent | 7875f6851a09fcb233f9797fa735c71745096010 (diff) | |
| parent | ca5437cab81a2cd8d670e5a73f3b6517d07f3ba8 (diff) | |
Merge "Rename BroadcastOptions.setAllowBackgroundActivityStarts() to setBackgroundActivityStartsAllowed()"
| -rw-r--r-- | api/system-current.txt | 2 | ||||
| -rw-r--r-- | core/java/android/app/BroadcastOptions.java | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/api/system-current.txt b/api/system-current.txt index 223a7e615c90..8b148dd2d163 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -474,7 +474,7 @@ package android.app { public class BroadcastOptions { method public static android.app.BroadcastOptions makeBasic(); - method @RequiresPermission("android.permission.START_ACTIVITIES_FROM_BACKGROUND") public void setAllowBackgroundActivityStarts(boolean); + method @RequiresPermission("android.permission.START_ACTIVITIES_FROM_BACKGROUND") public void setBackgroundActivityStartsAllowed(boolean); method public void setDontSendToRestrictedApps(boolean); method @RequiresPermission(android.Manifest.permission.CHANGE_DEVICE_IDLE_TEMP_WHITELIST) public void setTemporaryAppWhitelistDuration(long); method public android.os.Bundle toBundle(); diff --git a/core/java/android/app/BroadcastOptions.java b/core/java/android/app/BroadcastOptions.java index 062a462b71fd..161e2ad06ec0 100644 --- a/core/java/android/app/BroadcastOptions.java +++ b/core/java/android/app/BroadcastOptions.java @@ -61,7 +61,7 @@ public class BroadcastOptions { "android:broadcast.dontSendToRestrictedApps"; /** - * Corresponds to {@link #setAllowBackgroundActivityStarts}. + * Corresponds to {@link #setBackgroundActivityStartsAllowed}. */ static final String KEY_ALLOW_BACKGROUND_ACTIVITY_STARTS = "android:broadcast.allowBackgroundActivityStarts"; @@ -161,7 +161,7 @@ public class BroadcastOptions { * the broadcast dispatch. Default value is {@code false} */ @RequiresPermission(android.Manifest.permission.START_ACTIVITIES_FROM_BACKGROUND) - public void setAllowBackgroundActivityStarts(boolean allowBackgroundActivityStarts) { + public void setBackgroundActivityStartsAllowed(boolean allowBackgroundActivityStarts) { mAllowBackgroundActivityStarts = allowBackgroundActivityStarts; } |