Merge "Add support for configuring max home app pin per device" into main (e205e5ea) · Commits · e / os / android_frameworks_base

core/res/res/values/config.xml

+2 −2

Original line number	Diff line number	Diff line
		@@ -4444,8 +4444,8 @@
		<!-- True if camera app should be pinned via Pinner Service -->
		<bool name="config_pinnerCameraApp">false</bool>

		<!-- True if home app should be pinned via Pinner Service -->
		<bool name="config_pinnerHomeApp">false</bool>
		<!-- Bytes that the PinnerService will pin for Home app -->
		<integer name="config_pinnerHomePinBytes">0</integer>

		<!-- True if assistant app should be pinned via Pinner Service -->
		<bool name="config_pinnerAssistantApp">false</bool>

core/res/res/values/symbols.xml

+1 −1

Original line number	Diff line number	Diff line
		@@ -3437,7 +3437,7 @@
		<!-- Pinner Service -->
		<java-symbol type="array" name="config_defaultPinnerServiceFiles" />
		<java-symbol type="bool" name="config_pinnerCameraApp" />
		<java-symbol type="bool" name="config_pinnerHomeApp" />
		<java-symbol type="integer" name="config_pinnerHomePinBytes" />
		<java-symbol type="bool" name="config_pinnerAssistantApp" />
		<java-symbol type="integer" name="config_pinnerWebviewPinBytes" />

services/core/java/com/android/server/PinnerService.java

+6 −7

Original line number	Diff line number	Diff line
		@@ -121,7 +121,6 @@ public final class PinnerService extends SystemService {
		SystemProperties.getBoolean("pinner.use_pinlist", true);

		private static final int MAX_CAMERA_PIN_SIZE = 80 * (1 << 20); // 80MB max for camera app.
		private static final int MAX_HOME_PIN_SIZE = 6 * (1 << 20); // 6MB max for home app.
		private static final int MAX_ASSISTANT_PIN_SIZE = 60 * (1 << 20); // 60MB max for assistant app.

		public static final String ANON_REGION_STAT_NAME = "[anon]";
		@@ -176,7 +175,7 @@ public final class PinnerService extends SystemService {

		// Resource-configured pinner flags;
		private final boolean mConfiguredToPinCamera;
		private final boolean mConfiguredToPinHome;
		private final int mConfiguredHomePinBytes;
		private final boolean mConfiguredToPinAssistant;
		private final int mConfiguredWebviewPinBytes;

		@@ -238,8 +237,8 @@ public final class PinnerService extends SystemService {
		mDeviceConfigInterface = mInjector.getDeviceConfigInterface();
		mConfiguredToPinCamera = context.getResources().getBoolean(
		com.android.internal.R.bool.config_pinnerCameraApp);
		mConfiguredToPinHome = context.getResources().getBoolean(
		com.android.internal.R.bool.config_pinnerHomeApp);
		mConfiguredHomePinBytes = context.getResources().getInteger(
		com.android.internal.R.integer.config_pinnerHomePinBytes);
		mConfiguredToPinAssistant = context.getResources().getBoolean(
		com.android.internal.R.bool.config_pinnerAssistantApp);
		mConfiguredWebviewPinBytes = context.getResources().getInteger(
		@@ -390,7 +389,7 @@ public final class PinnerService extends SystemService {
		@Override
		public void onChange(boolean selfChange, Uri uri) {
		if (userSetupCompleteUri.equals(uri)) {
		if (mConfiguredToPinHome) {
		if (mConfiguredHomePinBytes > 0) {
		sendPinAppMessage(KEY_HOME, ActivityManager.getCurrentUser(),
		true /* force */);
		}
		@@ -594,7 +593,7 @@ public final class PinnerService extends SystemService {
		Slog.i(TAG, "Pinner - skip pinning camera app");
		}

		if (mConfiguredToPinHome) {
		if (mConfiguredHomePinBytes > 0) {
		pinKeys.add(KEY_HOME);
		}
		if (mConfiguredToPinAssistant) {
		@@ -815,7 +814,7 @@ public final class PinnerService extends SystemService {
		case KEY_CAMERA:
		return MAX_CAMERA_PIN_SIZE;
		case KEY_HOME:
		return MAX_HOME_PIN_SIZE;
		return mConfiguredHomePinBytes;
		case KEY_ASSISTANT:
		return MAX_ASSISTANT_PIN_SIZE;
		default:

services/tests/servicestests/src/com/android/server/PinnerServiceTest.java

+3 −3

Original line number	Diff line number	Diff line
		@@ -112,7 +112,7 @@ public class PinnerServiceTest {
		resources.addOverride(
		com.android.internal.R.array.config_defaultPinnerServiceFiles, new String[0]);
		resources.addOverride(com.android.internal.R.bool.config_pinnerCameraApp, false);
		resources.addOverride(com.android.internal.R.bool.config_pinnerHomeApp, false);
		resources.addOverride(com.android.internal.R.integer.config_pinnerHomePinBytes, 0);
		resources.addOverride(com.android.internal.R.bool.config_pinnerAssistantApp, false);

		mFakeDeviceConfigInterface = new FakeDeviceConfigInterface();
		@@ -242,7 +242,7 @@ public class PinnerServiceTest {
		public void testPinHomeApp() throws Exception {
		// Enable HOME app pinning
		mContext.getOrCreateTestableResources()
		.addOverride(com.android.internal.R.bool.config_pinnerHomeApp, true);
		.addOverride(com.android.internal.R.integer.config_pinnerHomePinBytes, 1024);
		PinnerService pinnerService = new PinnerService(mContext, mInjector);
		pinnerService.onStart();

		@@ -266,7 +266,7 @@ public class PinnerServiceTest {
		public void testPinHomeAppOnBootCompleted() throws Exception {
		// Enable HOME app pinning
		mContext.getOrCreateTestableResources()
		.addOverride(com.android.internal.R.bool.config_pinnerHomeApp, true);
		.addOverride(com.android.internal.R.integer.config_pinnerHomePinBytes, 1024);
		PinnerService pinnerService = new PinnerService(mContext, mInjector);
		pinnerService.onStart();