diff options
| author | Alex Klyubin <klyubin@google.com> | 2015-02-11 12:37:12 -0800 |
|---|---|---|
| committer | Alex Klyubin <klyubin@google.com> | 2015-02-11 12:37:12 -0800 |
| commit | 33d3c53da021f0d044028860ace0f4ad817273f5 (patch) | |
| tree | 1ebd67dbfa35109595bd6258633abba7931f1290 /core/java/android/hardware | |
| parent | c093955af1434a7023093acb148ab152d915e59c (diff) | |
| parent | 517e0274cb2cfd215b20622280d5e256e8282bbb (diff) | |
| download | frameworks_base-33d3c53da021f0d044028860ace0f4ad817273f5.zip frameworks_base-33d3c53da021f0d044028860ace0f4ad817273f5.tar.gz frameworks_base-33d3c53da021f0d044028860ace0f4ad817273f5.tar.bz2 | |
resolved conflicts for merge of 517e0274 to lmp-mr1-dev-plus-aosp
Change-Id: Ic20b6c8851458483dd73a144bd5ae6e8d141e62a
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"); |