summaryrefslogtreecommitdiffstats
path: root/core/java/android/hardware/soundtrigger
diff options
context:
space:
mode:
authorAlex Klyubin <klyubin@google.com>2015-02-11 19:34:30 +0000
committerandroid-build-merger <android-build-merger@google.com>2015-02-11 19:34:30 +0000
commit517e0274cb2cfd215b20622280d5e256e8282bbb (patch)
treec4faa0b3e8d1db30fc8a2deb3bb13b38de5a9364 /core/java/android/hardware/soundtrigger
parent1641e192a82e266159e0b82078a8f98ebcd3d8ff (diff)
parent1a24bb597aeb1b019d55988b574e5db1b0e4232c (diff)
downloadframeworks_base-517e0274cb2cfd215b20622280d5e256e8282bbb.zip
frameworks_base-517e0274cb2cfd215b20622280d5e256e8282bbb.tar.gz
frameworks_base-517e0274cb2cfd215b20622280d5e256e8282bbb.tar.bz2
Merge "Move hidden ApplicationInfo flags into a separate field."
automerge: 1a24bb5 * commit '1a24bb597aeb1b019d55988b574e5db1b0e4232c': Move hidden ApplicationInfo flags into a separate field.
Diffstat (limited to 'core/java/android/hardware/soundtrigger')
-rw-r--r--core/java/android/hardware/soundtrigger/KeyphraseEnrollmentInfo.java2
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");