summaryrefslogtreecommitdiffstats
path: root/api
diff options
context:
space:
mode:
authorDianne Hackborn <hackbod@google.com>2011-06-17 14:53:10 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-06-17 14:53:10 -0700
commitca1e210dd6d8d46bc672cca4da827b77205f285d (patch)
tree8f7f19f619f6c66d11d9a922f5f8935d4b377d39 /api
parentdc4280419b44f2da0aa3f734af5fa28def67dc99 (diff)
parent0ac3031c159a0904e73eb4439cdc724d8df4a6e6 (diff)
downloadframeworks_base-ca1e210dd6d8d46bc672cca4da827b77205f285d.zip
frameworks_base-ca1e210dd6d8d46bc672cca4da827b77205f285d.tar.gz
frameworks_base-ca1e210dd6d8d46bc672cca4da827b77205f285d.tar.bz2
Merge "Implement remaining infrastructure for user disabling apps."
Diffstat (limited to 'api')
-rw-r--r--api/current.txt1
1 files changed, 1 insertions, 0 deletions
diff --git a/api/current.txt b/api/current.txt
index 1d5692f..51c9348 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -5810,6 +5810,7 @@ package android.content.pm {
method public abstract void setInstallerPackageName(java.lang.String, java.lang.String);
field public static final int COMPONENT_ENABLED_STATE_DEFAULT = 0; // 0x0
field public static final int COMPONENT_ENABLED_STATE_DISABLED = 2; // 0x2
+ field public static final int COMPONENT_ENABLED_STATE_DISABLED_USER = 3; // 0x3
field public static final int COMPONENT_ENABLED_STATE_ENABLED = 1; // 0x1
field public static final int DONT_KILL_APP = 1; // 0x1
field public static final java.lang.String FEATURE_AUDIO_LOW_LATENCY = "android.hardware.audio.low_latency";