Merge "Change permissions checks for setAirplaneMode." am: 38149e3ea7 am: 65b71e6a20

am: 5fe041f889

Change-Id: Icfc55aefa11a5e1dd92382c2be94c7b63889aa8f
This commit is contained in:
Lorenzo Colitti 2018-10-15 08:49:52 -07:00 • committed by android-build-merger
commit d96f450cb2

View file

@ -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 {