| commit | 0a53121de5434ce9430b713cae552a6af16f1bf7 | [log] [tgz] |
|---|---|---|
| author | Mark Chien <markchien@google.com> | Mon Oct 12 10:03:26 2020 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Mon Oct 12 10:03:26 2020 +0000 |
| tree | f9ff60d2f1aac30f3456707de185ff596705ecc6 | |
| parent | 9d881ec1ce4f51ed3ff7e80e4e9536ecd2274ff0 [diff] | |
| parent | 6eacfb6b733e1d4dee3db3438f81c42d944d88f8 [diff] |
Merge changes I60ed5465,I70b49d0a into mainline-prod * changes: Make the IP subnet persistent till reboot Make PrivateAddressCoordinator ignore vpn network
diff --git a/Tethering/src/com/android/networkstack/tethering/Tethering.java b/Tethering/src/com/android/networkstack/tethering/Tethering.java index 877cf9d..474f4e8 100644 --- a/Tethering/src/com/android/networkstack/tethering/Tethering.java +++ b/Tethering/src/com/android/networkstack/tethering/Tethering.java
@@ -2096,7 +2096,7 @@ } private boolean hasCallingPermission(@NonNull String permission) { - return mContext.checkCallingPermission(permission) == PERMISSION_GRANTED; + return mContext.checkCallingOrSelfPermission(permission) == PERMISSION_GRANTED; } /** Unregister tethering event callback */
diff --git a/Tethering/tests/integration/src/android/net/EthernetTetheringTest.java b/Tethering/tests/integration/src/android/net/EthernetTetheringTest.java index 64be2d9..d206ea0 100644 --- a/Tethering/tests/integration/src/android/net/EthernetTetheringTest.java +++ b/Tethering/tests/integration/src/android/net/EthernetTetheringTest.java
@@ -553,7 +553,6 @@ TestNetworkManager tnm = mContext.getSystemService(TestNetworkManager.class); TestNetworkInterface iface = tnm.createTapInterface(); Log.d(TAG, "Created test interface " + iface.getInterfaceName()); - assertNotNull(NetworkInterface.getByName(iface.getInterfaceName())); return iface; }