Snap for 5719587 from da0d82c21695e11bd40fa4daaf0c3d76c64b0ab4 to qt-release (6304a705) · Commits · e / os / android_frameworks_base

packages/SettingsLib/src/com/android/settingslib/bluetooth/HidProfile.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -117,7 +117,7 @@ public class HidProfile implements LocalBluetoothProfile {

		public boolean isPreferred(BluetoothDevice device) {
		if (mService == null) return false;
		return mService.getPriority(device) > BluetoothProfile.PRIORITY_OFF;
		return mService.getPriority(device) != BluetoothProfile.PRIORITY_OFF;
		}

		public int getPreferred(BluetoothDevice device) {

packages/SettingsLib/src/com/android/settingslib/net/DataUsageUtils.java

+3 −22

Original line number	Diff line number	Diff line
		@@ -18,15 +18,11 @@ package com.android.settingslib.net;

		import android.content.Context;
		import android.net.NetworkTemplate;
		import android.os.ParcelUuid;
		import android.telephony.SubscriptionInfo;
		import android.telephony.SubscriptionManager;
		import android.telephony.TelephonyManager;
		import android.util.Log;

		import java.util.ArrayList;
		import java.util.List;

		/**
		* Utils class for data usage
		*/
		@@ -38,7 +34,7 @@ public class DataUsageUtils {
		*/
		public static NetworkTemplate getMobileTemplate(Context context, int subId) {
		final TelephonyManager telephonyManager = context.getSystemService(
		TelephonyManager.class);
		TelephonyManager.class).createForSubscriptionId(subId);
		final SubscriptionManager subscriptionManager = context.getSystemService(
		SubscriptionManager.class);
		final SubscriptionInfo info = subscriptionManager.getActiveSubscriptionInfo(subId);
		@@ -49,23 +45,8 @@ public class DataUsageUtils {
		Log.i(TAG, "Subscription is not active: " + subId);
		return mobileAll;
		}
		final ParcelUuid groupUuid = info.getGroupUuid();
		if (groupUuid == null) {
		Log.i(TAG, "Subscription doesn't have valid group uuid: " + subId);
		return mobileAll;
		}

		// Otherwise merge other subscriberId to create new NetworkTemplate
		final List<SubscriptionInfo> groupInfos = subscriptionManager.getSubscriptionsInGroup(
		groupUuid);
		final List<String> mergedSubscriberIds = new ArrayList<>();
		for (SubscriptionInfo subInfo : groupInfos) {
		final String subscriberId = telephonyManager.getSubscriberId(
		subInfo.getSubscriptionId());
		if (subscriberId != null) {
		mergedSubscriberIds.add(subscriberId);
		}
		}
		return NetworkTemplate.normalize(mobileAll, mergedSubscriberIds.toArray(new String[0]));
		// Use old API to build networkTemplate
		return NetworkTemplate.normalize(mobileAll, telephonyManager.getMergedSubscriberIds());
		}
		}

packages/SettingsLib/tests/robotests/src/com/android/settingslib/net/DataUsageUtilsTest.java

+4 −15

Original line number	Diff line number	Diff line
		@@ -44,7 +44,6 @@ import java.util.List;
		public class DataUsageUtilsTest {

		private static final int SUB_ID = 1;
		private static final int SUB_ID_2 = 2;
		private static final String SUBSCRIBER_ID = "Test Subscriber";
		private static final String SUBSCRIBER_ID_2 = "Test Subscriber 2";

		@@ -67,11 +66,11 @@ public class DataUsageUtilsTest {

		mContext = spy(RuntimeEnvironment.application);
		when(mContext.getSystemService(TelephonyManager.class)).thenReturn(mTelephonyManager);
		when(mTelephonyManager.createForSubscriptionId(SUB_ID)).thenReturn(mTelephonyManager);
		when(mContext.getSystemService(SubscriptionManager.class)).thenReturn(mSubscriptionManager);
		when(mTelephonyManager.getSubscriberId(SUB_ID)).thenReturn(SUBSCRIBER_ID);
		when(mTelephonyManager.getSubscriberId(SUB_ID_2)).thenReturn(SUBSCRIBER_ID_2);
		when(mInfo1.getSubscriptionId()).thenReturn(SUB_ID);
		when(mInfo2.getSubscriptionId()).thenReturn(SUB_ID_2);
		when(mTelephonyManager.getMergedSubscriberIds()).thenReturn(
		new String[]{SUBSCRIBER_ID, SUBSCRIBER_ID_2});

		mInfos = new ArrayList<>();
		mInfos.add(mInfo1);
		@@ -89,17 +88,7 @@ public class DataUsageUtilsTest {
		}

		@Test
		public void getMobileTemplate_groupUuidNull_returnMobileAll() {
		when(mSubscriptionManager.getActiveSubscriptionInfo(SUB_ID)).thenReturn(mInfo1);
		when(mInfo1.getGroupUuid()).thenReturn(null);

		final NetworkTemplate networkTemplate = DataUsageUtils.getMobileTemplate(mContext, SUB_ID);
		assertThat(networkTemplate.matchesSubscriberId(SUBSCRIBER_ID)).isTrue();
		assertThat(networkTemplate.matchesSubscriberId(SUBSCRIBER_ID_2)).isFalse();
		}

		@Test
		public void getMobileTemplate_groupUuidExist_returnMobileMerged() {
		public void getMobileTemplate_infoExisted_returnMobileMerged() {
		when(mSubscriptionManager.getActiveSubscriptionInfo(SUB_ID)).thenReturn(mInfo1);
		when(mInfo1.getGroupUuid()).thenReturn(mParcelUuid);

packages/SystemUI/res/values-ar/strings.xml

+1 −1

Original line number	Diff line number	Diff line
		@@ -463,7 +463,7 @@
		<string name="battery_saver_notification_title" msgid="8614079794522291840">"تم تفعيل ميزة توفير شحن البطارية"</string>
		<string name="battery_saver_notification_text" msgid="820318788126672692">"لخفض مستوى الأداء وبيانات الخلفية"</string>
		<string name="battery_saver_notification_action_text" msgid="132118784269455533">"إيقاف ميزة توفير شحن البطارية"</string>
		<string name="media_projection_dialog_text" msgid="8585357687598538511">"أثناء التسجيل أو الإرسال، يمكن لتطبيق <xliff:g id="APP_SEEKING_PERMISSION">%s</xliff:g> تسجيل أي معلومات حساسة يتم عرضها على الشاشة أو تشغيلها من جهازك، بما فيها المعلومات الحساسة مثل الصوت الذي تشغّله وكلمات المرور ومعلومات الدفع والصور والرسائل."</string>
		<string name="media_projection_dialog_text" msgid="8585357687598538511">"أثناء التسجيل أو البث، يمكن لتطبيق <xliff:g id="APP_SEEKING_PERMISSION">%s</xliff:g> تسجيل أي معلومات حسّاسة يتم عرضها على الشاشة أو تشغيلها من جهازك، بما فيها المعلومات الحسّاسة مثل المقاطع الصوتية وكلمات المرور ومعلومات الدفع والصور والرسائل."</string>
		<string name="media_projection_dialog_service_text" msgid="3075544489835858258">"أثناء التسجيل أو الإرسال، يمكن للخدمة التي تقدّم هذه الوظيفة تسجيل أي معلومات حساسة يتم عرضها على الشاشة أو تشغيلها من جهازك، بما فيها المعلومات الحساسة مثل الصوت الذي تشغّله وكلمات المرور ومعلومات الدفع والصور والرسائل."</string>
		<string name="media_projection_dialog_title" msgid="8124184308671641248">"عرض معلومات حسّاسة أثناء الإرسال/التسجيل"</string>
		<string name="media_projection_remember_text" msgid="3103510882172746752">"عدم الإظهار مرة أخرى"</string>

packages/SystemUI/res/values-bn/strings.xml

+1 −1

Original line number	Diff line number	Diff line
		@@ -778,7 +778,7 @@
		<string name="drag_to_add_tiles" msgid="230586591689084925">"টাইল যোগ করতে ধরে থেকে টেনে আনুন"</string>
		<string name="drag_to_rearrange_tiles" msgid="4566074720193667473">"টাইলগুলি আবার সাজানোর জন্য ধরে থেকে টেনে আনুন"</string>
		<string name="drag_to_remove_tiles" msgid="3361212377437088062">"সরানোর জন্য এখানে টেনে আনুন"</string>
		<string name="drag_to_remove_disabled" msgid="2390968976638993382">"অন্তত ৬টি টাইল রাখতে হবে"</string>
		<string name="drag_to_remove_disabled" msgid="4785920129548299268">"আপনাকে কমপক্ষে <xliff:g id="MIN_NUM_TILES">%1$d</xliff:g>টি টাইল রাখতে হবে"</string>
		<string name="qs_edit" msgid="2232596095725105230">"সম্পাদনা করুন"</string>
		<string name="tuner_time" msgid="6572217313285536011">"সময়"</string>
		<string-array name="clock_options">