diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-04-20 21:09:21 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2020-04-20 21:09:21 +0000 |
| commit | 8ad8c284ca31abac1a538f06205441937a4d6ded (patch) | |
| tree | 8fedbca5d9ee8a075772848396461423fe691394 /service | |
| parent | 9d1fa2cdb82d7435d25d88854726528962ca79c9 (diff) | |
| parent | c7f7a636e55d4f2acbbc7f5f6b85c4f1d3b69cac (diff) | |
Merge "WifiServiceImpl: Always Use enforceCallingOrSelfPermission" into rvc-dev
Diffstat (limited to 'service')
| -rw-r--r-- | service/java/com/android/server/wifi/WifiServiceImpl.java | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/service/java/com/android/server/wifi/WifiServiceImpl.java b/service/java/com/android/server/wifi/WifiServiceImpl.java index 4a9902484..6e339044a 100644 --- a/service/java/com/android/server/wifi/WifiServiceImpl.java +++ b/service/java/com/android/server/wifi/WifiServiceImpl.java @@ -3874,7 +3874,7 @@ public class WifiServiceImpl extends BaseWifiService { */ @Override public void setDeviceMobilityState(@DeviceMobilityState int state) { - mContext.enforceCallingPermission( + mContext.enforceCallingOrSelfPermission( android.Manifest.permission.WIFI_SET_DEVICE_MOBILITY_STATE, "WifiService"); if (mVerboseLoggingEnabled) { @@ -4000,7 +4000,7 @@ public class WifiServiceImpl extends BaseWifiService { if (listener == null) { throw new IllegalArgumentException("Listener must not be null"); } - mContext.enforceCallingPermission( + mContext.enforceCallingOrSelfPermission( android.Manifest.permission.WIFI_UPDATE_USABILITY_STATS_SCORE, "WifiService"); if (mVerboseLoggingEnabled) { mLog.info("addOnWifiUsabilityStatsListener uid=%") @@ -4021,7 +4021,7 @@ public class WifiServiceImpl extends BaseWifiService { */ @Override public void removeOnWifiUsabilityStatsListener(int listenerIdentifier) { - mContext.enforceCallingPermission( + mContext.enforceCallingOrSelfPermission( android.Manifest.permission.WIFI_UPDATE_USABILITY_STATS_SCORE, "WifiService"); if (mVerboseLoggingEnabled) { mLog.info("removeOnWifiUsabilityStatsListener uid=%") @@ -4040,7 +4040,7 @@ public class WifiServiceImpl extends BaseWifiService { */ @Override public void updateWifiUsabilityScore(int seqNum, int score, int predictionHorizonSec) { - mContext.enforceCallingPermission( + mContext.enforceCallingOrSelfPermission( android.Manifest.permission.WIFI_UPDATE_USABILITY_STATS_SCORE, "WifiService"); if (mVerboseLoggingEnabled) { @@ -4205,7 +4205,7 @@ public class WifiServiceImpl extends BaseWifiService { if (scorer == null) { throw new IllegalArgumentException("Scorer must not be null"); } - mContext.enforceCallingPermission( + mContext.enforceCallingOrSelfPermission( android.Manifest.permission.WIFI_UPDATE_USABILITY_STATS_SCORE, "WifiService"); if (mVerboseLoggingEnabled) { mLog.info("setWifiConnectedNetworkScorer uid=%").c(Binder.getCallingUid()).flush(); @@ -4221,7 +4221,7 @@ public class WifiServiceImpl extends BaseWifiService { */ @Override public void clearWifiConnectedNetworkScorer() { - mContext.enforceCallingPermission( + mContext.enforceCallingOrSelfPermission( android.Manifest.permission.WIFI_UPDATE_USABILITY_STATS_SCORE, "WifiService"); if (mVerboseLoggingEnabled) { mLog.info("clearWifiConnectedNetworkScorer uid=%").c(Binder.getCallingUid()).flush(); |