summaryrefslogtreecommitdiffstats
path: root/packages/SettingsLib
diff options
context:
space:
mode:
authorZach Johnson <zachoverflow@google.com>2015-07-28 23:43:50 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-07-28 23:43:50 +0000
commit0117bc33e2af4045519c4155e4f8c2446db5ec17 (patch)
tree1ba958455a3a60fa30c609f7387ecded9e75caa0 /packages/SettingsLib
parent4c423351c0713e8255e32fa0feb7b606fe0c8278 (diff)
parentf8c99378367ef025b9da981d62806d1d06ef299e (diff)
downloadframeworks_base-0117bc33e2af4045519c4155e4f8c2446db5ec17.zip
frameworks_base-0117bc33e2af4045519c4155e4f8c2446db5ec17.tar.gz
frameworks_base-0117bc33e2af4045519c4155e4f8c2446db5ec17.tar.bz2
am f8c99378: am bd388372: am 5faa0336: Merge "Add filter for personal apps that are not disabled until first use" into mnc-dev
* commit 'f8c99378367ef025b9da981d62806d1d06ef299e': Add filter for personal apps that are not disabled until first use
Diffstat (limited to 'packages/SettingsLib')
-rw-r--r--packages/SettingsLib/src/com/android/settingslib/applications/ApplicationsState.java15
1 files changed, 15 insertions, 0 deletions
diff --git a/packages/SettingsLib/src/com/android/settingslib/applications/ApplicationsState.java b/packages/SettingsLib/src/com/android/settingslib/applications/ApplicationsState.java
index 40d5437..9eb7d0e 100644
--- a/packages/SettingsLib/src/com/android/settingslib/applications/ApplicationsState.java
+++ b/packages/SettingsLib/src/com/android/settingslib/applications/ApplicationsState.java
@@ -1239,6 +1239,21 @@ public class ApplicationsState {
}
};
+ public static final AppFilter FILTER_PERSONAL_WITHOUT_DISABLED_UNTIL_USED = new AppFilter() {
+ private int mCurrentUser;
+
+ public void init() {
+ mCurrentUser = ActivityManager.getCurrentUser();
+ }
+
+ @Override
+ public boolean filterApp(AppEntry entry) {
+ return UserHandle.getUserId(entry.info.uid) == mCurrentUser &&
+ entry.info.enabledSetting != PackageManager.COMPONENT_ENABLED_STATE_DISABLED_UNTIL_USED;
+ }
+ };
+
+
public static final AppFilter FILTER_WORK = new AppFilter() {
private int mCurrentUser;