diff options
| author | Alex Klyubin <klyubin@google.com> | 2015-02-11 20:47:31 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-02-11 20:47:31 +0000 |
| commit | 05ecfd308d983755bc7cab39ba99a37c321f176b (patch) | |
| tree | f49649de42c650b905fb2c226de5b24e8c09489b /core/java/android/hardware | |
| parent | 62958c7f3009f97dc185457feb01707d1eba740e (diff) | |
| parent | 33d3c53da021f0d044028860ace0f4ad817273f5 (diff) | |
| download | frameworks_base-05ecfd308d983755bc7cab39ba99a37c321f176b.zip frameworks_base-05ecfd308d983755bc7cab39ba99a37c321f176b.tar.gz frameworks_base-05ecfd308d983755bc7cab39ba99a37c321f176b.tar.bz2 | |
am 33d3c53d: resolved conflicts for merge of 517e0274 to lmp-mr1-dev-plus-aosp
* commit '33d3c53da021f0d044028860ace0f4ad817273f5':
Move hidden ApplicationInfo flags into a separate field.
Diffstat (limited to 'core/java/android/hardware')
| -rw-r--r-- | core/java/android/hardware/soundtrigger/KeyphraseEnrollmentInfo.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/hardware/soundtrigger/KeyphraseEnrollmentInfo.java b/core/java/android/hardware/soundtrigger/KeyphraseEnrollmentInfo.java index 518a874..cc018e9 100644 --- a/core/java/android/hardware/soundtrigger/KeyphraseEnrollmentInfo.java +++ b/core/java/android/hardware/soundtrigger/KeyphraseEnrollmentInfo.java @@ -104,7 +104,7 @@ public class KeyphraseEnrollmentInfo { try { ai = pm.getApplicationInfo( ri.activityInfo.packageName, PackageManager.GET_META_DATA); - if ((ai.flags & ApplicationInfo.FLAG_PRIVILEGED) == 0) { + if ((ai.privateFlags & ApplicationInfo.PRIVATE_FLAG_PRIVILEGED) == 0) { // The application isn't privileged (/system/priv-app). // The enrollment application needs to be a privileged system app. Slog.w(TAG, ai.packageName + "is not a privileged system app"); |