diff options
| author | Alex Klyubin <klyubin@google.com> | 2015-02-04 08:50:56 -0800 |
|---|---|---|
| committer | Alex Klyubin <klyubin@google.com> | 2015-02-11 11:10:36 -0800 |
| commit | c554922d6f7786efd6514d2332754d0e963f0f4d (patch) | |
| tree | 84957ec017b6f24a68fcf4aaf133aa2b01365c29 | |
| parent | 03a27b810ce70f2496f00a59ec79feb1da4e3b64 (diff) | |
| download | TvSettings-c554922d6f7786efd6514d2332754d0e963f0f4d.tar.gz | |
Hidden ApplicationInfo flags are now in privateFlags.
See b9f8a5204a1b0b3919fa921e858d04124c582828.
Change-Id: Ie23eb8ddd5129de3c6e008c5261b639e22182ee5
| -rw-r--r-- | Settings/src/com/android/tv/settings/users/AppLoadingTask.java | 3 | ||||
| -rw-r--r-- | Settings/src/com/android/tv/settings/users/UserAppRestrictionsDialogFragment.java | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/Settings/src/com/android/tv/settings/users/AppLoadingTask.java b/Settings/src/com/android/tv/settings/users/AppLoadingTask.java index 2812286ab..9f86da8b4 100644 --- a/Settings/src/com/android/tv/settings/users/AppLoadingTask.java +++ b/Settings/src/com/android/tv/settings/users/AppLoadingTask.java @@ -480,9 +480,10 @@ class AppLoadingTask extends AsyncTask<Void, Void, List<AppLoadingTask.Selectabl if (pi == null) return false; final int flags = pi.applicationInfo.flags; + final int privateFlags = pi.applicationInfo.privateFlags; // Return true if it is installed and not hidden return ((flags & ApplicationInfo.FLAG_INSTALLED) != 0 - && (flags & ApplicationInfo.FLAG_HIDDEN) == 0); + && (privateFlags & ApplicationInfo.PRIVATE_FLAG_HIDDEN) == 0); } private static Uri getAppIconUri(Context context, ApplicationInfo info, int iconRes) { diff --git a/Settings/src/com/android/tv/settings/users/UserAppRestrictionsDialogFragment.java b/Settings/src/com/android/tv/settings/users/UserAppRestrictionsDialogFragment.java index 86e8d7b5a..3e064c312 100644 --- a/Settings/src/com/android/tv/settings/users/UserAppRestrictionsDialogFragment.java +++ b/Settings/src/com/android/tv/settings/users/UserAppRestrictionsDialogFragment.java @@ -387,7 +387,7 @@ public class UserAppRestrictionsDialogFragment extends DialogFragment implements Log.d(TAG, "Installing " + packageName); } } - if (info != null && (info.flags & ApplicationInfo.FLAG_HIDDEN) != 0 + if (info != null && (info.privateFlags & ApplicationInfo.PRIVATE_FLAG_HIDDEN) != 0 && (info.flags & ApplicationInfo.FLAG_INSTALLED) != 0) { disableActionForPackage = true; ipm.setApplicationHiddenSettingAsUser(packageName, false, userId); |