Merge "Allow recents to add TYPE_NAVIGATION_BAR window for task bar" into main (4bec55f2) · Commits · e / os / android_frameworks_base

core/res/AndroidManifest.xml

+2 −2

Original line number	Diff line number	Diff line
		@@ -4653,7 +4653,7 @@
		@hide
		@SystemApi -->
		<permission android:name="android.permission.STATUS_BAR_SERVICE"
		android:protectionLevel="signature" />
		android:protectionLevel="signature\|recents" />

		<!-- Allows an application to bind to third party quick settings tiles.
		<p>Should only be requested by the System, should be required by
		@@ -4717,7 +4717,7 @@
		@hide
		-->
		<permission android:name="android.permission.INTERNAL_SYSTEM_WINDOW"
		android:protectionLevel="signature\|module" />
		android:protectionLevel="signature\|module\|recents" />

		<!-- Allows an application to avoid all toast rate limiting restrictions.
		<p>Not for use by third-party applications.

+4 −9

Original line number	Diff line number	Diff line
		@@ -1034,20 +1034,15 @@ public class DisplayPolicy {
		}
		break;
		case TYPE_NAVIGATION_BAR:
		mContext.enforcePermission(
		android.Manifest.permission.STATUS_BAR_SERVICE, callingPid, callingUid,
		"DisplayPolicy");
		mContext.enforcePermission(android.Manifest.permission.STATUS_BAR_SERVICE,
		callingPid, callingUid, "DisplayPolicy");
		if (mNavigationBar != null && mNavigationBar.isAlive()) {
		return WindowManagerGlobal.ADD_MULTIPLE_SINGLETON;
		}
		break;
		case TYPE_NAVIGATION_BAR_PANEL:
		// Check for permission if the caller is not the recents component.
		if (!mService.mAtmService.isCallerRecents(callingUid)) {
		mContext.enforcePermission(
		android.Manifest.permission.STATUS_BAR_SERVICE, callingPid, callingUid,
		"DisplayPolicy");
		}
		mContext.enforcePermission(android.Manifest.permission.STATUS_BAR_SERVICE,
		callingPid, callingUid, "DisplayPolicy");
		break;
		case TYPE_STATUS_BAR_ADDITIONAL:
		case TYPE_STATUS_BAR_SUB_PANEL: