diff options
| author | Lorenzo Colitti <lorenzo@google.com> | 2018-10-15 08:49:52 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-10-15 08:49:52 -0700 |
| commit | 03fc4a7f68142013aa1dfa80dfe6abc93622af42 (patch) | |
| tree | eabc4a5454ee637d74aaf5b6b364af08d0f8bfd6 /core/java/android | |
| parent | 82ecb5ffbd94ed5900b57810afff84dd652983aa (diff) | |
| parent | 3d23e905a97f7eb4cc1c8c88fccd01f897e14902 (diff) | |
Merge "Change permissions checks for setAirplaneMode." am: 3889ff53ed am: 10c175041e
am: 3d23e905a9
Change-Id: Icfc55aefa11a5e1dd92382c2be94c7b63889aa8f
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/net/ConnectivityManager.java | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/core/java/android/net/ConnectivityManager.java b/core/java/android/net/ConnectivityManager.java index c496ff4a3bd5..1fbfa40d5d64 100644 --- a/core/java/android/net/ConnectivityManager.java +++ b/core/java/android/net/ConnectivityManager.java @@ -2731,7 +2731,10 @@ public class ConnectivityManager { * * @hide */ - @RequiresPermission(android.Manifest.permission.CONNECTIVITY_INTERNAL) + @RequiresPermission(anyOf = { + android.Manifest.permission.NETWORK_SETTINGS, + android.Manifest.permission.NETWORK_SETUP_WIZARD, + android.Manifest.permission.NETWORK_STACK}) @SystemApi public void setAirplaneMode(boolean enable) { try { |