From 6fa01eb971e96f4fc389b37725f53d2c63139a84 Mon Sep 17 00:00:00 2001
From: Eric House <xwords@eehouse.org>
Date: Mon, 25 Sep 2017 06:17:44 -0700
Subject: [PATCH] move GCM-related permissions into new manifest

Create an AndroidManifest.xml specific for the xw4 variant, and move the
GCM-related permissions (including WakeLock) into it.
---
 xwords4/android/app/src/main/AndroidManifest.xml |  6 ------
 xwords4/android/app/src/xw4/AndroidManifest.xml  | 13 +++++++++++++
 2 files changed, 13 insertions(+), 6 deletions(-)
 create mode 100644 xwords4/android/app/src/xw4/AndroidManifest.xml

diff --git a/xwords4/android/app/src/main/AndroidManifest.xml b/xwords4/android/app/src/main/AndroidManifest.xml
index bc49a4b99..789de40e9 100644
--- a/xwords4/android/app/src/main/AndroidManifest.xml
+++ b/xwords4/android/app/src/main/AndroidManifest.xml
@@ -34,13 +34,7 @@
                 /> 
   <uses-feature android:name="android.hardware.nfc" android:required="false" />
 
-  <!-- GCM stuff -->
-  <permission android:name="${APP_ID}.permission.C2D_MESSAGE"
-              android:protectionLevel="signature" />
-  <uses-permission android:name="${APP_ID}.permission.C2D_MESSAGE" />
-  <uses-permission android:name="com.google.android.c2dm.permission.RECEIVE" />
   <uses-permission android:name="android.permission.GET_ACCOUNTS" />
-  <uses-permission android:name="android.permission.WAKE_LOCK" />
   <uses-permission android:name="android.permission.NFC" />
 
   <application android:icon="@drawable/icon48x48"
diff --git a/xwords4/android/app/src/xw4/AndroidManifest.xml b/xwords4/android/app/src/xw4/AndroidManifest.xml
new file mode 100644
index 000000000..d4935c9d1
--- /dev/null
+++ b/xwords4/android/app/src/xw4/AndroidManifest.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+          package="org.eehouse.android.xw4"
+          >
+
+  <!-- GCM stuff -->
+  <permission android:name="${APP_ID}.permission.C2D_MESSAGE"
+              android:protectionLevel="signature" />
+  <uses-permission android:name="${APP_ID}.permission.C2D_MESSAGE" />
+  <uses-permission android:name="com.google.android.c2dm.permission.RECEIVE" />
+  <uses-permission android:name="android.permission.WAKE_LOCK" />
+
+</manifest>