diff options
| author | Billy Lau <billylau@google.com> | 2015-08-01 18:20:04 +0100 |
|---|---|---|
| committer | Billy Lau <billylau@google.com> | 2015-08-07 19:00:49 +0100 |
| commit | 76502788598a85d24b9ae3e253016a9370c49a42 (patch) | |
| tree | 06f10f8f1fba60cc82702c3704162b29c43772cf | |
| parent | 0e47a8aae62e79d80db150bdde3298a100ab2d03 (diff) | |
| download | ethernet-marshmallow-dev.tar.gz | |
Bug: 21588539 Move CHANGE_NETWORK_STATE to be in SYSTEM_SETTINGSandroid-cts-6.0_r9android-cts-6.0_r8android-cts-6.0_r7android-cts-6.0_r6android-cts-6.0_r5android-cts-6.0_r4android-cts-6.0_r32android-cts-6.0_r31android-cts-6.0_r30android-cts-6.0_r3android-cts-6.0_r29android-cts-6.0_r28android-cts-6.0_r27android-cts-6.0_r26android-cts-6.0_r25android-cts-6.0_r24android-cts-6.0_r23android-cts-6.0_r22android-cts-6.0_r21android-cts-6.0_r20android-cts-6.0_r2android-cts-6.0_r19android-cts-6.0_r18android-cts-6.0_r17android-cts-6.0_r16android-cts-6.0_r15android-cts-6.0_r14android-cts-6.0_r13android-cts-6.0_r12android-cts-6.0_r1android-6.0.0_r7android-6.0.0_r6android-6.0.0_r5android-6.0.0_r4android-6.0.0_r3android-6.0.0_r2android-6.0.0_r1marshmallow-releasemarshmallow-devmarshmallow-cts-release
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
| -rw-r--r-- | java/com/android/server/ethernet/EthernetServiceImpl.java | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/java/com/android/server/ethernet/EthernetServiceImpl.java b/java/com/android/server/ethernet/EthernetServiceImpl.java index bb1cc51..0c84bef 100644 --- a/java/com/android/server/ethernet/EthernetServiceImpl.java +++ b/java/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() { |