-
+
diff --git a/play-services-gcm/src/main/java/com/google/android/gms/gcm/GcmListenerService.java b/play-services-gcm/src/main/java/com/google/android/gms/gcm/GcmListenerService.java
index ccf99acf61..6d911479a2 100644
--- a/play-services-gcm/src/main/java/com/google/android/gms/gcm/GcmListenerService.java
+++ b/play-services-gcm/src/main/java/com/google/android/gms/gcm/GcmListenerService.java
@@ -53,7 +53,7 @@
* android:name=".YourGcmListenerService"
* android:exported="false" >
*
- *
+ *
*
*
*/
diff --git a/play-services-gcm/src/main/java/com/google/android/gms/gcm/GcmNetworkManager.java b/play-services-gcm/src/main/java/com/google/android/gms/gcm/GcmNetworkManager.java
index a7ee9a8940..fc809ce25d 100644
--- a/play-services-gcm/src/main/java/com/google/android/gms/gcm/GcmNetworkManager.java
+++ b/play-services-gcm/src/main/java/com/google/android/gms/gcm/GcmNetworkManager.java
@@ -67,9 +67,9 @@
*
*
+ * android:permission="${basePackageName}.android.gms.permission.BIND_NETWORK_TASK_SERVICE" >
*
- *
+ *
*
*
*
diff --git a/play-services-gcm/src/main/java/com/google/android/gms/gcm/GcmReceiver.java b/play-services-gcm/src/main/java/com/google/android/gms/gcm/GcmReceiver.java
index 1df70bccb0..ed3d5b96a1 100644
--- a/play-services-gcm/src/main/java/com/google/android/gms/gcm/GcmReceiver.java
+++ b/play-services-gcm/src/main/java/com/google/android/gms/gcm/GcmReceiver.java
@@ -44,12 +44,12 @@
*
*
*
+ * android:permission="${basePackageName}.android.c2dm.permission.SEND" >
*
- *
- *
+ *
+ *
*
*
*
diff --git a/play-services-gcm/src/main/java/com/google/android/gms/gcm/GcmTaskService.java b/play-services-gcm/src/main/java/com/google/android/gms/gcm/GcmTaskService.java
index 0d790589ca..ba7ca20d55 100644
--- a/play-services-gcm/src/main/java/com/google/android/gms/gcm/GcmTaskService.java
+++ b/play-services-gcm/src/main/java/com/google/android/gms/gcm/GcmTaskService.java
@@ -38,10 +38,10 @@
* {@link com.google.android.gms.gcm.GcmTaskService#SERVICE_ACTION_EXECUTE_TASK}. Here's an example:
*
*
*
- *
+ *
*
*
*
diff --git a/play-services-iid/build.gradle b/play-services-iid/build.gradle
index d6b9231620..b7e9024f76 100644
--- a/play-services-iid/build.gradle
+++ b/play-services-iid/build.gradle
@@ -19,6 +19,10 @@ android {
versionName version
minSdkVersion androidMinSdk
targetSdkVersion androidTargetSdk
+
+ manifestPlaceholders = [
+ basePackageName: "$basePackageName"
+ ]
}
compileOptions {
diff --git a/play-services-iid/src/main/AndroidManifest.xml b/play-services-iid/src/main/AndroidManifest.xml
index 5a3b72361e..21c850f3d1 100644
--- a/play-services-iid/src/main/AndroidManifest.xml
+++ b/play-services-iid/src/main/AndroidManifest.xml
@@ -7,6 +7,6 @@
-
+
diff --git a/play-services-iid/src/main/java/com/google/android/gms/iid/InstanceIDListenerService.java b/play-services-iid/src/main/java/com/google/android/gms/iid/InstanceIDListenerService.java
index c7bf61c78e..6e160f6550 100644
--- a/play-services-iid/src/main/java/com/google/android/gms/iid/InstanceIDListenerService.java
+++ b/play-services-iid/src/main/java/com/google/android/gms/iid/InstanceIDListenerService.java
@@ -43,7 +43,7 @@
*
*
*
- *
+ *
*
*
* Do not export this service. Instead, keep it private to prevent other apps