Merge branch 'master' into realtime-rc-merge

Author: qdpham13

firebase-installations/src/main/java/com/google/firebase/installations/FirebaseInstallations.java

@@ -422,7 +422,8 @@ private void doNetworkCallIfNecessary(boolean forceRefresh) {
   private synchronized void updateFidListener(
       PersistedInstallationEntry prefs, PersistedInstallationEntry updatedPrefs) {
     if (fidListeners.size() != 0
-        && !prefs.getFirebaseInstallationId().equals(updatedPrefs.getFirebaseInstallationId())) {
+        && !TextUtils.equals(
+            prefs.getFirebaseInstallationId(), updatedPrefs.getFirebaseInstallationId())) {
       // Update all the registered FidListener about fid changes.
       for (FidListener listener : fidListeners) {
         listener.onFidChanged(updatedPrefs.getFirebaseInstallationId());

firebase-messaging/src/main/AndroidManifest.xml

@@ -16,6 +16,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
           package="com.google.firebase.messaging">
   <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+  <uses-permission android:name="android.permission.POST_NOTIFICATIONS"/>
   <uses-permission android:name="android.permission.WAKE_LOCK" />
   <!-- Required by older versions of Google Play services to create IID tokens -->
   <uses-permission android:name="com.google.android.c2dm.permission.RECEIVE" />