Merge changes I0c45635b,I2201d0e4 (ac08994f) · Commits · e / os / android_frameworks_base

packages/Tethering/src/com/android/server/connectivity/tethering/Tethering.java

+16 −31

Original line number	Diff line number	Diff line
		@@ -107,7 +107,6 @@ import androidx.annotation.NonNull;
		import androidx.annotation.Nullable;

		import com.android.internal.annotations.VisibleForTesting;
		import com.android.internal.messages.nano.SystemMessageProto.SystemMessage;
		import com.android.internal.util.IndentingPrintWriter;
		import com.android.internal.util.MessageUtils;
		import com.android.internal.util.State;
		@@ -663,19 +662,19 @@ public class Tethering {

		if (usbTethered) {
		if (wifiTethered \|\| bluetoothTethered) {
		showTetheredNotification(SystemMessage.NOTE_TETHER_GENERAL);
		showTetheredNotification(R.drawable.stat_sys_tether_general);
		} else {
		showTetheredNotification(SystemMessage.NOTE_TETHER_USB);
		showTetheredNotification(R.drawable.stat_sys_tether_usb);
		}
		} else if (wifiTethered) {
		if (bluetoothTethered) {
		showTetheredNotification(SystemMessage.NOTE_TETHER_GENERAL);
		showTetheredNotification(R.drawable.stat_sys_tether_general);
		} else {
		/* We now have a status bar icon for WifiTethering, so drop the notification */
		clearTetheredNotification();
		}
		} else if (bluetoothTethered) {
		showTetheredNotification(SystemMessage.NOTE_TETHER_BLUETOOTH);
		showTetheredNotification(R.drawable.stat_sys_tether_bluetooth);
		} else {
		clearTetheredNotification();
		}
		@@ -688,7 +687,8 @@ public class Tethering {
		@VisibleForTesting
		protected void showTetheredNotification(int id, boolean tetheringOn) {
		NotificationManager notificationManager =
		(NotificationManager) mContext.getSystemService(Context.NOTIFICATION_SERVICE);
		(NotificationManager) mContext.createContextAsUser(UserHandle.ALL, 0)
		.getSystemService(Context.NOTIFICATION_SERVICE);
		if (notificationManager == null) {
		return;
		}
		@@ -698,26 +698,11 @@ public class Tethering {
		NotificationManager.IMPORTANCE_LOW);
		notificationManager.createNotificationChannel(channel);

		int icon = 0;
		switch(id) {
		case SystemMessage.NOTE_TETHER_USB:
		icon = R.drawable.stat_sys_tether_usb;
		break;
		case SystemMessage.NOTE_TETHER_BLUETOOTH:
		icon = R.drawable.stat_sys_tether_bluetooth;
		break;
		case SystemMessage.NOTE_TETHER_GENERAL:
		default:
		icon = R.drawable.stat_sys_tether_general;
		break;
		}

		if (mLastNotificationId != 0) {
		if (mLastNotificationId == icon) {
		if (mLastNotificationId == id) {
		return;
		}
		notificationManager.cancelAsUser(null, mLastNotificationId,
		UserHandle.ALL);
		notificationManager.cancel(null, mLastNotificationId);
		mLastNotificationId = 0;
		}

		@@ -725,8 +710,8 @@ public class Tethering {
		intent.setClassName("com.android.settings", "com.android.settings.TetherSettings");
		intent.setFlags(Intent.FLAG_ACTIVITY_NO_HISTORY);

		PendingIntent pi = PendingIntent.getActivityAsUser(mContext, 0, intent, 0,
		null, UserHandle.CURRENT);
		PendingIntent pi = PendingIntent.getActivity(
		mContext.createContextAsUser(UserHandle.CURRENT, 0), 0, intent, 0, null);

		Resources r = mContext.getResources();
		final CharSequence title;
		@@ -749,23 +734,23 @@ public class Tethering {
		.setVisibility(Notification.VISIBILITY_PUBLIC)
		.setCategory(Notification.CATEGORY_STATUS);
		}
		mTetheredNotificationBuilder.setSmallIcon(icon)
		mTetheredNotificationBuilder.setSmallIcon(id)
		.setContentTitle(title)
		.setContentText(message)
		.setContentIntent(pi);
		mLastNotificationId = id;

		notificationManager.notifyAsUser(null, mLastNotificationId,
		mTetheredNotificationBuilder.buildInto(new Notification()), UserHandle.ALL);
		notificationManager.notify(null, mLastNotificationId,
		mTetheredNotificationBuilder.buildInto(new Notification()));
		}

		@VisibleForTesting
		protected void clearTetheredNotification() {
		NotificationManager notificationManager =
		(NotificationManager) mContext.getSystemService(Context.NOTIFICATION_SERVICE);
		(NotificationManager) mContext.createContextAsUser(UserHandle.ALL, 0)
		.getSystemService(Context.NOTIFICATION_SERVICE);
		if (notificationManager != null && mLastNotificationId != 0) {
		notificationManager.cancelAsUser(null, mLastNotificationId,
		UserHandle.ALL);
		notificationManager.cancel(null, mLastNotificationId);
		mLastNotificationId = 0;
		}
		}

packages/Tethering/tests/unit/src/com/android/server/connectivity/tethering/TetheringTest.java

+6 −0

Original line number	Diff line number	Diff line
		@@ -224,6 +224,11 @@ public class TetheringTest {
		if (TelephonyManager.class.equals(serviceClass)) return Context.TELEPHONY_SERVICE;
		return super.getSystemServiceName(serviceClass);
		}

		@Override
		public Context createContextAsUser(UserHandle user, int flags) {
		return mContext;
		}
		}

		public class MockIpServerDependencies extends IpServer.Dependencies {
		@@ -432,6 +437,7 @@ public class TetheringTest {
		.thenReturn(true);

		mServiceContext = new TestContext(mContext);
		when(mContext.getSystemService(Context.NOTIFICATION_SERVICE)).thenReturn(null);
		mContentResolver = new MockContentResolver(mServiceContext);
		mContentResolver.addProvider(Settings.AUTHORITY, new FakeSettingsProvider());
		Settings.Global.putInt(mContentResolver, TETHER_ENABLE_LEGACY_DHCP_SERVER, 0);