Merge "Fixed how ContentCapture checks for system apps." (4180876b) · Commits · e / os / android_frameworks_base

core/java/android/app/Activity.java

+2 −1

Original line number	Original line	Diff line number	Diff line
	@@ -17,6 +17,7 @@
	package android.app;		package android.app;

	import static android.Manifest.permission.CONTROL_REMOTE_APP_TRANSITION_ANIMATIONS;		import static android.Manifest.permission.CONTROL_REMOTE_APP_TRANSITION_ANIMATIONS;
			import static android.os.Process.myUid;

	import static java.lang.Character.MIN_VALUE;		import static java.lang.Character.MIN_VALUE;

	@@ -1025,7 +1026,7 @@ public class Activity extends ContextThemeWrapper
	*/		*/
	@Nullable private ContentCaptureManager getContentCaptureManager() {		@Nullable private ContentCaptureManager getContentCaptureManager() {
	// ContextCapture disabled for system apps		// ContextCapture disabled for system apps
	if (getApplicationInfo().isSystemApp()) return null;		if (!UserHandle.isApp(myUid())) return null;
	if (mContentCaptureManager == null) {		if (mContentCaptureManager == null) {
	mContentCaptureManager = getSystemService(ContentCaptureManager.class);		mContentCaptureManager = getSystemService(ContentCaptureManager.class);
	}		}