Merge "Make tetherChangePermission to be secured for AppOps permission" am: ad9c0373ab (83d03005) · Commits · e / os / android_frameworks_opt_telephony

tests/telephonytests/src/com/android/internal/telephony/mocks/ConnectivityServiceMock.java

+6 −5

Original line number	Diff line number	Diff line
		@@ -522,11 +522,11 @@ public class ConnectivityServiceMock extends IConnectivityManager.Stub
		throw new RuntimeException("not implemented");
		}

		public int tether(String iface) {
		public int tether(String iface, String callerPkg) {
		throw new RuntimeException("not implemented");
		}

		public int untether(String iface) {
		public int untether(String iface, String callerPkg) {
		throw new RuntimeException("not implemented");
		}

		@@ -546,7 +546,7 @@ public class ConnectivityServiceMock extends IConnectivityManager.Stub
		throw new RuntimeException("not implemented");
		}

		public int setUsbTethering(boolean enable) {
		public int setUsbTethering(boolean enable, String callerPkg) {
		throw new RuntimeException("not implemented");
		}

		@@ -572,12 +572,13 @@ public class ConnectivityServiceMock extends IConnectivityManager.Stub
		}

		@Override
		public void startTethering(int type, ResultReceiver receiver, boolean showProvisioningUi) {
		public void startTethering(int type, ResultReceiver receiver, boolean showProvisioningUi,
		String callerPkg) {
		throw new RuntimeException("not implemented");
		}

		@Override
		public void stopTethering(int type) {
		public void stopTethering(int type, String callerPkg) {
		throw new RuntimeException("not implemented");
		}