Optimize reportNetworkConnectivity permission check
Eliminate overhead in the common case by only checking for the permission
when the call fails.
Change-Id: I7d8c680ff745963b82b374596616cdd70922adfc
diff --git a/framework/src/android/net/ConnectivityManager.java b/framework/src/android/net/ConnectivityManager.java
index f619c28..f9751c2 100644
--- a/framework/src/android/net/ConnectivityManager.java
+++ b/framework/src/android/net/ConnectivityManager.java
@@ -3139,14 +3139,16 @@
*/
public void reportNetworkConnectivity(@Nullable Network network, boolean hasConnectivity) {
printStackTrace();
- if (mContext.checkSelfPermission(Manifest.permission.INTERNET) != PackageManager.PERMISSION_GRANTED) {
+ try {
+ mService.reportNetworkConnectivity(network, hasConnectivity);
+ } catch (SecurityException e) {
// ConnectivityService enforces this by throwing an unexpected SecurityException,
// which puts GMS into a crash loop. Also useful for other apps that don't expect that
// INTERNET permission might get revoked.
- return;
- }
- try {
- mService.reportNetworkConnectivity(network, hasConnectivity);
+ if (mContext.checkSelfPermission(Manifest.permission.INTERNET) ==
+ PackageManager.PERMISSION_GRANTED) {
+ throw e;
+ }
} catch (RemoteException e) {
throw e.rethrowFromSystemServer();
}