Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "PinnerService: add pinner.pin_camera to toggle camera pinning"

Browse Source
This commit is contained in:
TreeHugger Robot
2019-08-05 17:57:43 +00:00
committed by Android (Google) Code Review
parent 363eab80b2 a6d3cd1bb9
commit 72a487722f
1 changed files with 30 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
services/core/java/com/android/server/PinnerService.java
View File

@@ -95,6 +95,16 @@ public final class PinnerService extends SystemService {
private static final int KEY_CAMERA = 0;
private static final int KEY_HOME = 1;
// Pin the camera application.
private static boolean PROP_PIN_CAMERA = SystemProperties.getBoolean(
"pinner.pin_camera", true);
// Pin using pinlist.meta when pinning apps.
private static boolean PROP_PIN_PINLIST = SystemProperties.getBoolean(
"pinner.use_pinlist", true);
// Pin the whole odex/vdex/etc file when pinning apps.
private static boolean PROP_PIN_ODEX = SystemProperties.getBoolean(
"pinner.whole_odex", 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.
@@ -158,7 +168,11 @@ public final class PinnerService extends SystemService {
boolean shouldPinHome = context.getResources().getBoolean(
com.android.internal.R.bool.config_pinnerHomeApp);
if (shouldPinCamera) {
mPinKeys.add(KEY_CAMERA);
if (PROP_PIN_CAMERA) {
mPinKeys.add(KEY_CAMERA);
} else if (DEBUG) {
Slog.i(TAG, "Pinner - skip pinning camera app");
}
}
if (shouldPinHome) {
mPinKeys.add(KEY_HOME);
@@ -589,10 +603,16 @@ public final class PinnerService extends SystemService {
pf = pinFile(file, pinSizeLimit, /*attemptPinIntrospection=*/false);
if (pf != null) {
synchronized (this) {
pinnedApp.mFiles.add(pf);
if (PROP_PIN_ODEX) {
pinnedApp.mFiles.add(pf);
}
}
if (DEBUG) {
Slog.i(TAG, "Pinned " + pf.fileName);
if (PROP_PIN_ODEX) {
Slog.i(TAG, "Pinned " + pf.fileName);
} else {
Slog.i(TAG, "Pinned [skip] " + pf.fileName);
}
}
}
}
@@ -686,6 +706,13 @@ public final class PinnerService extends SystemService {
* @return Open input stream or null on any error
*/
private static InputStream maybeOpenPinMetaInZip(ZipFile zipFile, String fileName) {
if (!PROP_PIN_PINLIST) {
if (DEBUG) {
Slog.i(TAG, "Pin - skip pinlist.meta in " + fileName);
}
return null;
}
ZipEntry pinMetaEntry = zipFile.getEntry(PIN_META_FILENAME);
InputStream pinMetaStream = null;
if (pinMetaEntry != null) {