From 96a82ff4af87f19708112ea5f0d343d6857a1205 Mon Sep 17 00:00:00 2001
From: Adnan Begovic <adnan@cyngn.com>
Date: Fri, 20 May 2016 13:01:40 -0700
Subject: Camera2: Use new window manager flag for prevent system keys.

Change-Id: I8c47a20db36af25516fb7a17031d451d9b46a48d
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 1051956a6..053f85be6 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -30,7 +30,7 @@
     <uses-permission android:name="android.permission.WRITE_MEDIA_STORAGE" />
     <uses-permission android:name="android.permission.WRITE_SETTINGS" />
     <uses-permission android:name="android.permission.WRITE_SYNC_SETTINGS" />
-    <uses-permission android:name="android.permission.PREVENT_POWER_KEY" />
+    <uses-permission android:name="android.permission.PREVENT_SYSTEM_KEYS" />
     <uses-permission android:name="com.android.gallery3d.permission.STORAGE_CHANGE" />
 
     <supports-screens
diff --git a/src/com/android/camera/CameraActivity.java b/src/com/android/camera/CameraActivity.java
index 5ac39bf24..b73559469 100644
--- a/src/com/android/camera/CameraActivity.java
+++ b/src/com/android/camera/CameraActivity.java
@@ -2251,10 +2251,10 @@ public class CameraActivity extends QuickActivity
         mPowerShutter = Keys.isPowerShutterOn(mSettingsManager);
         if (mPowerShutter) {
             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