From 20dd431f201104d362f1a3ecffc091685733b494 Mon Sep 17 00:00:00 2001 From: "Philip P. Moltmann" Date: Mon, 8 Oct 2018 16:56:49 -0700 Subject: [PATCH] Do not allow to revert setForceSafeLabel Test: Built Bug: 116798569 Change-Id: I3f26d4466c84d3decb1c4962fb45e900ba35f68e --- api/system-current.txt | 2 +- core/java/android/content/pm/PackageItemInfo.java | 6 ++---- .../com/android/packageinstaller/PackageInstallerApplication.java | 2 +- services/java/com/android/server/SystemServer.java | 2 +- 4 files changed, 5 insertions(+), 7 deletions(-) diff --git a/api/system-current.txt b/api/system-current.txt index 85cc1e4404de..30a0c850f865 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -1118,9 +1118,9 @@ package android.content.pm { } public class PackageItemInfo { + method public static void forceSafeLabels(); method public deprecated java.lang.CharSequence loadSafeLabel(android.content.pm.PackageManager); method public java.lang.CharSequence loadSafeLabel(android.content.pm.PackageManager, float, int); - method public static void setForceSafeLabels(boolean); field public static final int SAFE_LABEL_FLAG_FIRST_LINE = 4; // 0x4 field public static final int SAFE_LABEL_FLAG_SINGLE_LINE = 2; // 0x2 field public static final int SAFE_LABEL_FLAG_TRIM = 1; // 0x1 diff --git a/core/java/android/content/pm/PackageItemInfo.java b/core/java/android/content/pm/PackageItemInfo.java index 19af609a3e48..00aa5c291154 100644 --- a/core/java/android/content/pm/PackageItemInfo.java +++ b/core/java/android/content/pm/PackageItemInfo.java @@ -105,13 +105,11 @@ public class PackageItemInfo { /** * Always use {@link #loadSafeLabel safe labels} when calling {@link #loadLabel}. * - * @param forceSafeLabels {@code true} to enforce safe labels - * * @hide */ @SystemApi - public static void setForceSafeLabels(boolean forceSafeLabels) { - sForceSafeLabels = forceSafeLabels; + public static void forceSafeLabels() { + sForceSafeLabels = true; } /** diff --git a/packages/PackageInstaller/src/com/android/packageinstaller/PackageInstallerApplication.java b/packages/PackageInstaller/src/com/android/packageinstaller/PackageInstallerApplication.java index 9b7e64e81aa3..a0f0ae9fe277 100644 --- a/packages/PackageInstaller/src/com/android/packageinstaller/PackageInstallerApplication.java +++ b/packages/PackageInstaller/src/com/android/packageinstaller/PackageInstallerApplication.java @@ -23,6 +23,6 @@ public class PackageInstallerApplication extends Application { @Override public void onCreate() { super.onCreate(); - PackageItemInfo.setForceSafeLabels(true); + PackageItemInfo.forceSafeLabels(); } } diff --git a/services/java/com/android/server/SystemServer.java b/services/java/com/android/server/SystemServer.java index b8241d03a78e..52b849f93553 100644 --- a/services/java/com/android/server/SystemServer.java +++ b/services/java/com/android/server/SystemServer.java @@ -359,7 +359,7 @@ public final class SystemServer { // The system server should never make non-oneway calls Binder.setWarnOnBlocking(true); // The system server should always load safe labels - PackageItemInfo.setForceSafeLabels(true); + PackageItemInfo.forceSafeLabels(); // Default to FULL within the system server. SQLiteGlobal.sDefaultSyncMode = SQLiteGlobal.SYNC_MODE_FULL; -- 2.11.0