From 5cab2e3f008f6b6e21eda10af41904d094db88ce Mon Sep 17 00:00:00 2001
From: Adnan Begovic <adnan@cyngn.com>
Date: Fri, 20 May 2016 13:06:35 -0700
Subject: Snap: Use new window manager flag for prevent system keys.

Change-Id: I94ed12ddd33729a4fb486f7fb68f1bbab788b239
TICKET: FEIJ-522
---
 AndroidManifest.xml                        | 2 +-
 src/com/android/camera/CameraActivity.java | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 44d56cf7e..c7820f5ea 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -25,7 +25,7 @@
     <uses-permission android:name="android.permission.WRITE_SYNC_SETTINGS" />
     <uses-permission android:name="android.permission.MOUNT_UNMOUNT_FILESYSTEMS" />
     <uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS" />
-    <uses-permission android:name="android.permission.PREVENT_POWER_KEY" />
+    <uses-permission android:name="android.permission.PREVENT_SYSTEM_KEYS" />
 
     <supports-screens
         android:anyDensity="true"
diff --git a/src/com/android/camera/CameraActivity.java b/src/com/android/camera/CameraActivity.java
index f7aa35a43..347a60f65 100755
--- a/src/com/android/camera/CameraActivity.java
+++ b/src/com/android/camera/CameraActivity.java
@@ -1966,10 +1966,10 @@ public class CameraActivity extends Activity
         }
         if (mPowerShutter && mInCameraApp) {
             getWindow().addPrivateFlags(
-                    WindowManager.LayoutParams.PRIVATE_FLAG_PREVENT_POWER_KEY);
+                    WindowManager.LayoutParams.PRIVATE_FLAG_PREVENT_SYSTEM_KEYS);
         } else {
             getWindow().clearPrivateFlags(
-                    WindowManager.LayoutParams.PRIVATE_FLAG_PREVENT_POWER_KEY);
+                    WindowManager.LayoutParams.PRIVATE_FLAG_PREVENT_SYSTEM_KEYS);
         }
     }
 
-- 
cgit v1.2.3