diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-02-12 23:55:00 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-02-12 23:55:00 +0000 |
| commit | 438129f4aa3de6b53b92c4cee9b94a3eecc82a0c (patch) | |
| tree | 7bc1ce40383f94c871153c85d726138d93bbeab0 /core/java/android/net/ConnectivityManager.java | |
| parent | cadf93cc7e117301473ce76bd2c79837a3dd8b36 (diff) | |
| parent | 617b4b00e3aad9f70673eee84992747e8d7b26fe (diff) | |
Merge "Revert "NetworkRequest: Embed requestor uid & packageName"" am: 617b4b00e3
Change-Id: I00dd341f699d2a22cc3d190b43314a49bee9062a
Diffstat (limited to 'core/java/android/net/ConnectivityManager.java')
| -rw-r--r-- | core/java/android/net/ConnectivityManager.java | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/core/java/android/net/ConnectivityManager.java b/core/java/android/net/ConnectivityManager.java index f24de88a3fd9..94eda01410da 100644 --- a/core/java/android/net/ConnectivityManager.java +++ b/core/java/android/net/ConnectivityManager.java @@ -3747,7 +3747,6 @@ public class ConnectivityManager { checkCallbackNotNull(callback); Preconditions.checkArgument(action == REQUEST || need != null, "null NetworkCapabilities"); final NetworkRequest request; - final String callingPackageName = mContext.getOpPackageName(); try { synchronized(sCallbacks) { if (callback.networkRequest != null @@ -3759,11 +3758,10 @@ public class ConnectivityManager { Messenger messenger = new Messenger(handler); Binder binder = new Binder(); if (action == LISTEN) { - request = mService.listenForNetwork( - need, messenger, binder, callingPackageName); + request = mService.listenForNetwork(need, messenger, binder); } else { request = mService.requestNetwork( - need, messenger, timeoutMs, binder, legacyType, callingPackageName); + need, messenger, timeoutMs, binder, legacyType); } if (request != null) { sCallbacks.put(request, callback); @@ -4036,10 +4034,8 @@ public class ConnectivityManager { @NonNull PendingIntent operation) { printStackTrace(); checkPendingIntentNotNull(operation); - final String callingPackageName = mContext.getOpPackageName(); try { - mService.pendingRequestForNetwork( - request.networkCapabilities, operation, callingPackageName); + mService.pendingRequestForNetwork(request.networkCapabilities, operation); } catch (RemoteException e) { throw e.rethrowFromSystemServer(); } catch (ServiceSpecificException e) { @@ -4151,10 +4147,8 @@ public class ConnectivityManager { @NonNull PendingIntent operation) { printStackTrace(); checkPendingIntentNotNull(operation); - final String callingPackageName = mContext.getOpPackageName(); try { - mService.pendingListenForNetwork( - request.networkCapabilities, operation, callingPackageName); + mService.pendingListenForNetwork(request.networkCapabilities, operation); } catch (RemoteException e) { throw e.rethrowFromSystemServer(); } catch (ServiceSpecificException e) { |