Snap for 8717000 from f029d8cf1bf588ed46856fc2d0d78275cdd95bf8 to tm-release (9a38348c) · Commits · e / os / android_frameworks_base

core/java/android/hardware/display/DisplayManager.java

+8 −5

Original line number	Diff line number	Diff line
		@@ -559,18 +559,21 @@ public final class DisplayManager {
		* @see #DISPLAY_CATEGORY_PRESENTATION
		*/
		public Display[] getDisplays(String category) {
		final int[] displayIds = mGlobal.getDisplayIds();
		boolean includeDisabledDisplays = (category != null
		&& category.equals(DISPLAY_CATEGORY_ALL_INCLUDING_DISABLED));
		final int[] displayIds = mGlobal.getDisplayIds(includeDisabledDisplays);
		synchronized (mLock) {
		try {
		if (category == null
		\|\| DISPLAY_CATEGORY_ALL_INCLUDING_DISABLED.equals(category)) {
		addAllDisplaysLocked(mTempDisplays, displayIds);
		} else if (category.equals(DISPLAY_CATEGORY_PRESENTATION)) {
		if (category != null && category.equals(DISPLAY_CATEGORY_PRESENTATION)) {
		addPresentationDisplaysLocked(mTempDisplays, displayIds, Display.TYPE_WIFI);
		addPresentationDisplaysLocked(mTempDisplays, displayIds, Display.TYPE_EXTERNAL);
		addPresentationDisplaysLocked(mTempDisplays, displayIds, Display.TYPE_OVERLAY);
		addPresentationDisplaysLocked(mTempDisplays, displayIds, Display.TYPE_VIRTUAL);
		addPresentationDisplaysLocked(mTempDisplays, displayIds, Display.TYPE_INTERNAL);
		} else if ((category == null
		\|\| DISPLAY_CATEGORY_ALL_INCLUDING_DISABLED.equals(category))) {
		// All displays requested.
		addAllDisplaysLocked(mTempDisplays, displayIds);
		}
		return mTempDisplays.toArray(new Display[mTempDisplays.size()]);
		} finally {

+12 −1

Original line number	Diff line number	Diff line
		@@ -206,6 +206,16 @@ public final class DisplayManagerGlobal {
		*/
		@UnsupportedAppUsage
		public int[] getDisplayIds() {
		return getDisplayIds(/* includeDisabledDisplays= */ false);
		}

		/**
		* Gets all valid logical display ids and invalid ones if specified.
		*
		* @return An array containing all display ids.
		*/
		@UnsupportedAppUsage
		public int[] getDisplayIds(boolean includeDisabledDisplays) {
		try {
		synchronized (mLock) {
		if (USE_CACHE) {
		@@ -214,7 +224,8 @@ public final class DisplayManagerGlobal {
		}
		}

		int[] displayIds = mDm.getDisplayIds();
		int[] displayIds =
		mDm.getDisplayIds(includeDisabledDisplays);
		if (USE_CACHE) {
		mDisplayIdCache = displayIds;
		}

+1 −1

Original line number	Diff line number	Diff line
		@@ -36,7 +36,7 @@ import android.view.Surface;
		interface IDisplayManager {
		@UnsupportedAppUsage
		DisplayInfo getDisplayInfo(int displayId);
		int[] getDisplayIds();
		int[] getDisplayIds(boolean includeDisabled);

		boolean isUidPresentOnDisplay(int uid, int displayId);

+5 −1

Original line number	Diff line number	Diff line
		@@ -1501,7 +1501,10 @@ public class ResolverActivity extends Activity implements
		: R.string.miniresolver_use_personal_browser);

		findViewById(R.id.use_same_profile_browser).setOnClickListener(
		v -> safelyStartActivity(sameProfileResolveInfo));
		v -> {
		safelyStartActivity(sameProfileResolveInfo);
		finish();
		});

		findViewById(R.id.button_open).setOnClickListener(v -> {
		Intent intent = otherProfileResolveInfo.getResolvedIntent();
		@@ -1510,6 +1513,7 @@ public class ResolverActivity extends Activity implements
		}
		safelyStartActivityAsUser(otherProfileResolveInfo,
		inactiveAdapter.mResolverListController.getUserHandle());
		finish();
		});
		}

+1 −1

Original line number	Diff line number	Diff line
		@@ -643,7 +643,7 @@
		<string name="dream_complication_title_date" msgid="8661176085446135789">"تاریخ"</string>
		<string name="dream_complication_title_weather" msgid="598609151677172783">"آب‌وهوا"</string>
		<string name="dream_complication_title_aqi" msgid="4587552608957834110">"کیفیت هوا"</string>
		<string name="dream_complication_title_cast_info" msgid="4038776652841885084">"اطلاعات ارسال محتوا"</string>
		<string name="dream_complication_title_cast_info" msgid="4038776652841885084">"اطلاعات پخش محتوا"</string>
		<string name="avatar_picker_title" msgid="8492884172713170652">"انتخاب عکس نمایه"</string>
		<string name="default_user_icon_description" msgid="6554047177298972638">"نماد کاربر پیش‌فرض"</string>
		<string name="physical_keyboard_title" msgid="4811935435315835220">"صفحه‌کلید فیزیکی"</string>