release-request-6db00e04-e62d-4e43-807a-a9cc1185dcbb-for-git_oc-mr1-release-41... (c41b4f64) · Commits · e / os / android_frameworks_base

core/java/android/app/ActivityManager.java

+7 −0

Original line number	Original line	Diff line number	Diff line
	@@ -359,6 +359,13 @@ public class ActivityManager {
	public static final int START_RETURN_LOCK_TASK_MODE_VIOLATION =		public static final int START_RETURN_LOCK_TASK_MODE_VIOLATION =
	FIRST_START_NON_FATAL_ERROR_CODE + 1;		FIRST_START_NON_FATAL_ERROR_CODE + 1;

			/**
			* Result for IActivityManaqer.startActivity: a new activity start was aborted. Never returned
			* externally.
			* @hide
			*/
			public static final int START_ABORTED = FIRST_START_NON_FATAL_ERROR_CODE + 2;

	/**		/**
	* Flag for IActivityManaqer.startActivity: do special start mode where		* Flag for IActivityManaqer.startActivity: do special start mode where
	* a new activity is launched only if it is needed.		* a new activity is launched only if it is needed.

core/java/android/app/ActivityThread.java

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -2361,13 +2361,13 @@ public final class ActivityThread {
	memInfo.nativeSwappablePss, memInfo.nativeSharedDirty,		memInfo.nativeSwappablePss, memInfo.nativeSharedDirty,
	memInfo.nativePrivateDirty, memInfo.nativeSharedClean,		memInfo.nativePrivateDirty, memInfo.nativeSharedClean,
	memInfo.nativePrivateClean, memInfo.hasSwappedOutPss ?		memInfo.nativePrivateClean, memInfo.hasSwappedOutPss ?
	memInfo.nativeSwappedOut : memInfo.nativeSwappedOutPss,		memInfo.nativeSwappedOutPss : memInfo.nativeSwappedOut,
	nativeMax, nativeAllocated, nativeFree);		nativeMax, nativeAllocated, nativeFree);
	printRow(pw, HEAP_FULL_COLUMN, "Dalvik Heap", memInfo.dalvikPss,		printRow(pw, HEAP_FULL_COLUMN, "Dalvik Heap", memInfo.dalvikPss,
	memInfo.dalvikSwappablePss, memInfo.dalvikSharedDirty,		memInfo.dalvikSwappablePss, memInfo.dalvikSharedDirty,
	memInfo.dalvikPrivateDirty, memInfo.dalvikSharedClean,		memInfo.dalvikPrivateDirty, memInfo.dalvikSharedClean,
	memInfo.dalvikPrivateClean, memInfo.hasSwappedOutPss ?		memInfo.dalvikPrivateClean, memInfo.hasSwappedOutPss ?
	memInfo.dalvikSwappedOut : memInfo.dalvikSwappedOutPss,		memInfo.dalvikSwappedOutPss : memInfo.dalvikSwappedOut,
	dalvikMax, dalvikAllocated, dalvikFree);		dalvikMax, dalvikAllocated, dalvikFree);
	} else {		} else {
	printRow(pw, HEAP_COLUMN, "", "Pss", "Private",		printRow(pw, HEAP_COLUMN, "", "Pss", "Private",

core/java/android/app/ContextImpl.java

+3 −10

Original line number	Original line	Diff line number	Diff line
	@@ -63,6 +63,7 @@ import android.os.ServiceManager;
	import android.os.SystemProperties;		import android.os.SystemProperties;
	import android.os.Trace;		import android.os.Trace;
	import android.os.UserHandle;		import android.os.UserHandle;
			import android.os.UserManager;
	import android.os.storage.IStorageManager;		import android.os.storage.IStorageManager;
	import android.os.storage.StorageManager;		import android.os.storage.StorageManager;
	import android.system.ErrnoException;		import android.system.ErrnoException;
	@@ -370,13 +371,6 @@ class ContextImpl extends Context {
	return getSharedPreferences(file, mode);		return getSharedPreferences(file, mode);
	}		}

	private boolean isBuggy() {
	// STOPSHIP: fix buggy apps
	if (SystemProperties.getBoolean("fw.ignore_buggy", false)) return false;
	if ("com.google.android.tts".equals(getApplicationInfo().packageName)) return true;
	return false;
	}

	@Override		@Override
	public SharedPreferences getSharedPreferences(File file, int mode) {		public SharedPreferences getSharedPreferences(File file, int mode) {
	SharedPreferencesImpl sp;		SharedPreferencesImpl sp;
	@@ -387,9 +381,8 @@ class ContextImpl extends Context {
	checkMode(mode);		checkMode(mode);
	if (getApplicationInfo().targetSdkVersion >= android.os.Build.VERSION_CODES.O) {		if (getApplicationInfo().targetSdkVersion >= android.os.Build.VERSION_CODES.O) {
	if (isCredentialProtectedStorage()		if (isCredentialProtectedStorage()
	&& !getSystemService(StorageManager.class).isUserKeyUnlocked(		&& !getSystemService(UserManager.class)
	UserHandle.myUserId())		.isUserUnlockingOrUnlocked(UserHandle.myUserId())) {
	&& !isBuggy()) {
	throw new IllegalStateException("SharedPreferences in credential encrypted "		throw new IllegalStateException("SharedPreferences in credential encrypted "
	+ "storage are not available until after user is unlocked");		+ "storage are not available until after user is unlocked");
	}		}

core/java/android/content/pm/LauncherActivityInfo.java

+1 −9

Original line number	Original line	Diff line number	Diff line
	@@ -20,12 +20,10 @@ import android.content.ComponentName;
	import android.content.Context;		import android.content.Context;
	import android.content.pm.PackageManager.NameNotFoundException;		import android.content.pm.PackageManager.NameNotFoundException;
	import android.content.res.Resources;		import android.content.res.Resources;
	import android.graphics.drawable.BitmapDrawable;
	import android.graphics.drawable.Drawable;		import android.graphics.drawable.Drawable;
	import android.os.UserHandle;		import android.os.UserHandle;
	import android.os.UserManager;		import android.os.UserManager;
	import android.util.DisplayMetrics;		import android.util.DisplayMetrics;
	import android.util.Log;

	/**		/**
	* A representation of an activity that can belong to this user or a managed		* A representation of an activity that can belong to this user or a managed
	@@ -173,12 +171,6 @@ public class LauncherActivityInfo {
	public Drawable getBadgedIcon(int density) {		public Drawable getBadgedIcon(int density) {
	Drawable originalIcon = getIcon(density);		Drawable originalIcon = getIcon(density);

	if (originalIcon instanceof BitmapDrawable) {
	// TODO: Go through LauncherAppsService
	return mPm.getUserBadgedIcon(originalIcon, mUser);		return mPm.getUserBadgedIcon(originalIcon, mUser);
	} else {
	Log.e(TAG, "Unable to create badged icon for " + mActivityInfo);
	}
	return originalIcon;
	}		}
	}		}

core/java/android/content/pm/PackageManager.java

+3 −0

Original line number	Original line	Diff line number	Diff line
	@@ -1490,6 +1490,9 @@ public abstract class PackageManager {
	*/		*/
	public static final int MOVE_FAILED_3RD_PARTY_NOT_ALLOWED_ON_INTERNAL = -9;		public static final int MOVE_FAILED_3RD_PARTY_NOT_ALLOWED_ON_INTERNAL = -9;

			/** @hide */
			public static final int MOVE_FAILED_LOCKED_USER = -10;

	/**		/**
	* Flag parameter for {@link #movePackage} to indicate that		* Flag parameter for {@link #movePackage} to indicate that
	* the package should be moved to internal storage if its		* the package should be moved to internal storage if its