diff options
author | Justin Klaassen <justinklaassen@google.com> | 2018-04-15 00:41:15 -0400 |
---|---|---|
committer | Justin Klaassen <justinklaassen@google.com> | 2018-04-15 00:41:15 -0400 |
commit | b8042fc9b036db0a6692ca853428fc6ab1e60892 (patch) | |
tree | 82669ea5d75238758e22d379a42baeada526219e /com/android/server/pm/Settings.java | |
parent | 4d01eeaffaa720e4458a118baa137a11614f00f7 (diff) | |
download | android-28-androidx-arch-core-release.tar.gz |
Import Android SDK Platform P [4719250]HEADmastermainandroidx-work-releaseandroidx-webkit-releaseandroidx-viewpager2-releaseandroidx-versionedparcelable-releaseandroidx-vectordrawable-releaseandroidx-transition-releaseandroidx-sqlite-releaseandroidx-sharetarget-releaseandroidx-security-security-crypto-releaseandroidx-savedstate-releaseandroidx-room-releaseandroidx-recyclerview-releaseandroidx-recyclerview-recyclerview-selection-releaseandroidx-preference-releaseandroidx-paging-releaseandroidx-paging-legacy-releaseandroidx-navigation-releaseandroidx-mediarouter-releaseandroidx-media2-releaseandroidx-media2-media2-widget-releaseandroidx-media-releaseandroidx-master-releaseandroidx-localbroadcastmanager-releaseandroidx-loader-releaseandroidx-lifecycle-releaseandroidx-jetifier-releaseandroidx-g3-releaseandroidx-fragment-releaseandroidx-exifinterface-releaseandroidx-enterprise-releaseandroidx-core-releaseandroidx-core-core-role-releaseandroidx-coordinatorlayout-releaseandroidx-concurrent-releaseandroidx-compose-releaseandroidx-collection-releaseandroidx-camerax-releaseandroidx-browser-releaseandroidx-biometric-releaseandroidx-benchmark-releaseandroidx-autofill-releaseandroidx-arch-core-releaseandroidx-appcompat-releaseandroidx-annotation-releaseandroidx-annotation-annotation-experimental-releaseandroidx-activity-releaseandroid-arch-work-releaseandroid-arch-navigation-release
/google/data/ro/projects/android/fetch_artifact \
--bid 4719250 \
--target sdk_phone_armv7-win_sdk \
sdk-repo-linux-sources-4719250.zip
AndroidVersion.ApiLevel has been modified to appear as 28
Change-Id: I9ec0a12c9251b8449dba0d86b0cfdbcca16b0a7c
Diffstat (limited to 'com/android/server/pm/Settings.java')
-rw-r--r-- | com/android/server/pm/Settings.java | 21 |
1 files changed, 18 insertions, 3 deletions
diff --git a/com/android/server/pm/Settings.java b/com/android/server/pm/Settings.java index d0e85443..898ecf3c 100644 --- a/com/android/server/pm/Settings.java +++ b/com/android/server/pm/Settings.java @@ -222,6 +222,7 @@ public final class Settings { private static final String ATTR_HIDDEN = "hidden"; private static final String ATTR_SUSPENDED = "suspended"; private static final String ATTR_SUSPENDING_PACKAGE = "suspending-package"; + private static final String ATTR_SUSPEND_DIALOG_MESSAGE = "suspend_dialog_message"; // Legacy, uninstall blocks are stored separately. @Deprecated private static final String ATTR_BLOCK_UNINSTALL = "blockUninstall"; @@ -734,6 +735,7 @@ public final class Settings { false /*hidden*/, false /*suspended*/, null, /*suspendingPackage*/ + null, /*dialogMessage*/ null, /*suspendedAppExtras*/ null, /*suspendedLauncherExtras*/ instantApp, @@ -1628,6 +1630,7 @@ public final class Settings { false /*hidden*/, false /*suspended*/, null, /*suspendingPackage*/ + null, /*dialogMessage*/ null, /*suspendedAppExtras*/ null, /*suspendedLauncherExtras*/ false /*instantApp*/, @@ -1704,6 +1707,8 @@ public final class Settings { false); String suspendingPackage = parser.getAttributeValue(null, ATTR_SUSPENDING_PACKAGE); + final String dialogMessage = parser.getAttributeValue(null, + ATTR_SUSPEND_DIALOG_MESSAGE); if (suspended && suspendingPackage == null) { suspendingPackage = PLATFORM_PACKAGE_NAME; } @@ -1767,7 +1772,7 @@ public final class Settings { setBlockUninstallLPw(userId, name, true); } ps.setUserState(userId, ceDataInode, enabled, installed, stopped, notLaunched, - hidden, suspended, suspendingPackage, suspendedAppExtras, + hidden, suspended, suspendingPackage, dialogMessage, suspendedAppExtras, suspendedLauncherExtras, instantApp, virtualPreload, enabledCaller, enabledComponents, disabledComponents, verifState, linkGeneration, installReason, harmfulAppWarning); @@ -2077,7 +2082,14 @@ public final class Settings { } if (ustate.suspended) { serializer.attribute(null, ATTR_SUSPENDED, "true"); - serializer.attribute(null, ATTR_SUSPENDING_PACKAGE, ustate.suspendingPackage); + if (ustate.suspendingPackage != null) { + serializer.attribute(null, ATTR_SUSPENDING_PACKAGE, + ustate.suspendingPackage); + } + if (ustate.dialogMessage != null) { + serializer.attribute(null, ATTR_SUSPEND_DIALOG_MESSAGE, + ustate.dialogMessage); + } if (ustate.suspendedAppExtras != null) { serializer.startTag(null, TAG_SUSPENDED_APP_EXTRAS); try { @@ -4750,8 +4762,11 @@ public final class Settings { pw.print(" suspended="); pw.print(ps.getSuspended(user.id)); if (ps.getSuspended(user.id)) { + final PackageUserState pus = ps.readUserState(user.id); pw.print(" suspendingPackage="); - pw.print(ps.readUserState(user.id).suspendingPackage); + pw.print(pus.suspendingPackage); + pw.print(" dialogMessage="); + pw.print(pus.dialogMessage); } pw.print(" stopped="); pw.print(ps.getStopped(user.id)); |