From 824a0a5050c589cc00be53fb574b060917345766 Mon Sep 17 00:00:00 2001 From: Billy Lau Date: Sat, 1 Aug 2015 18:20:04 +0100 Subject: [PATCH] Bug: 21588539 Move CHANGE_NETWORK_STATE to be in SYSTEM_SETTINGS Replaced the method where we used to enforce static permission CHANGE_NETWORK_STATE to method calls that also check for WRITE_SETTINGS. This is due to the merging of CHANGE_NETWORK_STATE permission with WRITE_SETTINGS in M. Change-Id: I104ac41733663b4f6b5cd30e7314574ec4acdc07 --- .../com/android/server/ethernet/EthernetServiceImpl.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/service-t/src/com/android/server/ethernet/EthernetServiceImpl.java b/service-t/src/com/android/server/ethernet/EthernetServiceImpl.java index bb1cc514e4..0c84befbcd 100644 --- a/service-t/src/com/android/server/ethernet/EthernetServiceImpl.java +++ b/service-t/src/com/android/server/ethernet/EthernetServiceImpl.java @@ -28,6 +28,7 @@ import android.os.Handler; import android.os.HandlerThread; import android.os.RemoteCallbackList; import android.os.RemoteException; +import android.provider.Settings; import android.util.Log; import android.util.PrintWriterPrinter; @@ -74,9 +75,9 @@ public class EthernetServiceImpl extends IEthernetManager.Stub { } private void enforceChangePermission() { - mContext.enforceCallingOrSelfPermission( - android.Manifest.permission.CHANGE_NETWORK_STATE, - "EthernetService"); + int uid = Binder.getCallingUid(); + Settings.checkAndNoteChangeNetworkStateOperation(mContext, uid, Settings + .getPackageNameForUid(mContext, uid), true); } private void enforceConnectivityInternalPermission() {