diff options
| author | Remi NGUYEN VAN <reminv@google.com> | 2019-01-31 12:46:00 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2019-01-31 12:46:00 +0000 |
| commit | 859a5d0f86a579e9af9296f6bd29419cdca0f499 (patch) | |
| tree | 83a316211befc99701ceeca949e613ebf9dff719 /src | |
| parent | d9595902dabc494c9f1ca351b41d4825e4a2f586 (diff) | |
| parent | b85d8753a77c77297f7be4e62deb7f55c62c90e4 (diff) | |
Merge "Prepare CaptivePortalLogin for system_current"
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/server/connectivity/NetworkMonitor.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/com/android/server/connectivity/NetworkMonitor.java b/src/com/android/server/connectivity/NetworkMonitor.java index b34efc4..dbffa6d 100644 --- a/src/com/android/server/connectivity/NetworkMonitor.java +++ b/src/com/android/server/connectivity/NetworkMonitor.java @@ -109,6 +109,8 @@ public class NetworkMonitor extends StateMachine { private static final boolean DBG = true; private static final boolean VDBG = false; private static final boolean VDBG_STALL = Log.isLoggable(TAG, Log.DEBUG); + // TODO: use another permission for CaptivePortalLoginActivity once it has its own certificate + private static final String PERMISSION_NETWORK_SETTINGS = "android.permission.NETWORK_SETTINGS"; // Default configuration values for captive portal detection probes. // TODO: append a random length parameter to the default HTTPS url. // TODO: randomize browser version ids in the default User-Agent String. @@ -682,7 +684,7 @@ public class NetworkMonitor extends StateMachine { public void appResponse(int response) { if (response == APP_RETURN_WANTED_AS_IS) { mContext.enforceCallingPermission( - android.Manifest.permission.CONNECTIVITY_INTERNAL, + PERMISSION_NETWORK_SETTINGS, "CaptivePortal"); } sendMessage(CMD_CAPTIVE_PORTAL_APP_FINISHED, response); @@ -692,7 +694,7 @@ public class NetworkMonitor extends StateMachine { public void logEvent(int eventId, String packageName) throws RemoteException { mContext.enforceCallingPermission( - android.Manifest.permission.CONNECTIVITY_INTERNAL, + PERMISSION_NETWORK_SETTINGS, "CaptivePortal"); mCallback.logCaptivePortalLoginEvent(eventId, packageName); } |