Integrate Latest @ 198776339

jonsimantov · jonsimantov · commit a59f76348512 · 2018-05-31T14:38:22.000-07:00
Changes to all ...
- Updated Android SDK versions and Gradle tool versions.
- Change Android targetSdkVersion to 24.
Changes to storage/testapp ...
- Change the Storage testapp to resume only after the pause has completed.

CL: 198776339
diff --git a/admob/testapp/AndroidManifest.xml b/admob/testapp/AndroidManifest.xml
@@ -6,7 +6,7 @@
   <uses-permission android:name="android.permission.INTERNET" />
   <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
   <uses-permission android:name="android.permission.WAKE_LOCK" />
-  <uses-sdk android:minSdkVersion="14" android:targetSdkVersion="23" />
+  <uses-sdk android:minSdkVersion="14" android:targetSdkVersion="24" />
   <application android:label="@string/app_name">
     <activity android:name="android.app.NativeActivity"
       android:screenOrientation="portrait"
diff --git a/admob/testapp/build.gradle b/admob/testapp/build.gradle
@@ -6,8 +6,8 @@ buildscript {
     jcenter()
   }
   dependencies {
-    classpath 'com.android.tools.build:gradle:2.3.1'
-    classpath 'com.google.gms:google-services:3.0.0'
+    classpath 'com.android.tools.build:gradle:3.1.0'
+    classpath 'com.google.gms:google-services:4.0.1'
   }
 }
 
@@ -92,8 +92,8 @@ android {
 
 dependencies {
   compile 'com.google.firebase:firebase-core:16.0.0'
-  compile 'com.google.firebase:firebase-ads:16.0.0'
-  compile 'com.google.android.gms:play-services-base:15.0.1'
+  compile 'com.google.firebase:firebase-ads:15.0.1'
+  compile 'com.google.firebase:firebase-common:16.0.0'
 }
 
 apply plugin: 'com.google.gms.google-services'
diff --git a/admob/testapp/gradle/wrapper/gradle-wrapper.properties b/admob/testapp/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip
diff --git a/analytics/testapp/AndroidManifest.xml b/analytics/testapp/AndroidManifest.xml
@@ -6,7 +6,7 @@
   <uses-permission android:name="android.permission.INTERNET" />
   <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
   <uses-permission android:name="android.permission.WAKE_LOCK" />
-  <uses-sdk android:minSdkVersion="14" android:targetSdkVersion="23" />
+  <uses-sdk android:minSdkVersion="14" android:targetSdkVersion="24" />
   <application android:label="@string/app_name">
     <activity android:name="android.app.NativeActivity"
               android:screenOrientation="portrait"
diff --git a/analytics/testapp/build.gradle b/analytics/testapp/build.gradle
@@ -6,8 +6,8 @@ buildscript {
     jcenter()
   }
   dependencies {
-    classpath 'com.android.tools.build:gradle:2.3.1'
-    classpath 'com.google.gms:google-services:3.0.0'
+    classpath 'com.android.tools.build:gradle:3.1.0'
+    classpath 'com.google.gms:google-services:4.0.1'
   }
 }
 
@@ -93,7 +93,7 @@ android {
 dependencies {
   compile 'com.google.firebase:firebase-core:16.0.0'
   compile 'com.google.firebase:firebase-analytics:16.0.0'
-  compile 'com.google.android.gms:play-services-base:15.0.1'
+  compile 'com.google.firebase:firebase-common:16.0.0'
 }
 
 apply plugin: 'com.google.gms.google-services'
diff --git a/analytics/testapp/gradle/wrapper/gradle-wrapper.properties b/analytics/testapp/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip
diff --git a/auth/testapp/AndroidManifest.xml b/auth/testapp/AndroidManifest.xml
@@ -6,7 +6,7 @@
   <uses-permission android:name="android.permission.INTERNET" />
   <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
   <uses-permission android:name="android.permission.WAKE_LOCK" />
-  <uses-sdk android:minSdkVersion="14" android:targetSdkVersion="23" />
+  <uses-sdk android:minSdkVersion="14" android:targetSdkVersion="24" />
   <application android:label="@string/app_name">
     <activity android:name="android.app.NativeActivity"
               android:screenOrientation="portrait"
diff --git a/auth/testapp/build.gradle b/auth/testapp/build.gradle
@@ -6,8 +6,8 @@ buildscript {
     jcenter()
   }
   dependencies {
-    classpath 'com.android.tools.build:gradle:2.3.1'
-    classpath 'com.google.gms:google-services:3.0.0'
+    classpath 'com.android.tools.build:gradle:3.1.0'
+    classpath 'com.google.gms:google-services:4.0.1'
   }
 }
 
@@ -93,7 +93,7 @@ android {
 dependencies {
   compile 'com.google.firebase:firebase-core:16.0.0'
   compile 'com.google.firebase:firebase-auth:16.0.1'
-  compile 'com.google.android.gms:play-services-base:15.0.1'
+  compile 'com.google.firebase:firebase-common:16.0.0'
 }
 
 apply plugin: 'com.google.gms.google-services'
diff --git a/auth/testapp/gradle/wrapper/gradle-wrapper.properties b/auth/testapp/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip
diff --git a/database/testapp/AndroidManifest.xml b/database/testapp/AndroidManifest.xml
@@ -6,7 +6,7 @@
   <uses-permission android:name="android.permission.INTERNET" />
   <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
   <uses-permission android:name="android.permission.WAKE_LOCK" />
-  <uses-sdk android:minSdkVersion="14" android:targetSdkVersion="23" />
+  <uses-sdk android:minSdkVersion="14" android:targetSdkVersion="24" />
   <application android:label="@string/app_name">
     <activity android:name="android.app.NativeActivity"
               android:screenOrientation="portrait"
diff --git a/database/testapp/build.gradle b/database/testapp/build.gradle
@@ -6,8 +6,8 @@ buildscript {
     jcenter()
   }
   dependencies {
-    classpath 'com.android.tools.build:gradle:2.3.1'
-    classpath 'com.google.gms:google-services:3.0.0'
+    classpath 'com.android.tools.build:gradle:3.1.0'
+    classpath 'com.google.gms:google-services:4.0.1'
   }
 }
 
diff --git a/database/testapp/gradle/wrapper/gradle-wrapper.properties b/database/testapp/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip
diff --git a/dynamic_links/testapp/AndroidManifest.xml b/dynamic_links/testapp/AndroidManifest.xml
@@ -6,7 +6,7 @@
   <uses-permission android:name="android.permission.INTERNET" />
   <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
   <uses-permission android:name="android.permission.WAKE_LOCK" />
-  <uses-sdk android:minSdkVersion="14" android:targetSdkVersion="23" />
+  <uses-sdk android:minSdkVersion="14" android:targetSdkVersion="24" />
   <application android:label="@string/app_name">
     <activity android:name="android.app.NativeActivity"
               android:screenOrientation="portrait"
diff --git a/dynamic_links/testapp/build.gradle b/dynamic_links/testapp/build.gradle
@@ -6,8 +6,8 @@ buildscript {
     jcenter()
   }
   dependencies {
-    classpath 'com.android.tools.build:gradle:2.3.1'
-    classpath 'com.google.gms:google-services:3.0.0'
+    classpath 'com.android.tools.build:gradle:3.1.0'
+    classpath 'com.google.gms:google-services:4.0.1'
   }
 }
 
@@ -93,7 +93,7 @@ android {
 dependencies {
   compile 'com.google.firebase:firebase-core:16.0.0'
   compile 'com.google.firebase:firebase-invites:16.0.0'
-  compile 'com.google.android.gms:play-services-base:15.0.1'
+  compile 'com.google.firebase:firebase-common:16.0.0'
 }
 
 apply plugin: 'com.google.gms.google-services'
diff --git a/dynamic_links/testapp/gradle/wrapper/gradle-wrapper.properties b/dynamic_links/testapp/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip
diff --git a/invites/testapp/AndroidManifest.xml b/invites/testapp/AndroidManifest.xml
@@ -4,7 +4,7 @@
           android:versionCode="1"
           android:versionName="1.0">
   <uses-permission android:name="android.permission.INTERNET" />
-  <uses-sdk android:minSdkVersion="14" android:targetSdkVersion="23" />
+  <uses-sdk android:minSdkVersion="14" android:targetSdkVersion="24" />
   <application android:label="@string/app_name">
     <activity android:name="android.app.NativeActivity"
               android:screenOrientation="portrait"
diff --git a/invites/testapp/build.gradle b/invites/testapp/build.gradle
@@ -6,8 +6,8 @@ buildscript {
     jcenter()
   }
   dependencies {
-    classpath 'com.android.tools.build:gradle:2.3.1'
-    classpath 'com.google.gms:google-services:3.0.0'
+    classpath 'com.android.tools.build:gradle:3.1.0'
+    classpath 'com.google.gms:google-services:4.0.1'
   }
 }
 
@@ -93,7 +93,7 @@ android {
 dependencies {
   compile 'com.google.firebase:firebase-core:16.0.0'
   compile 'com.google.firebase:firebase-invites:16.0.0'
-  compile 'com.google.android.gms:play-services-base:15.0.1'
+  compile 'com.google.firebase:firebase-common:16.0.0'
 }
 
 apply plugin: 'com.google.gms.google-services'
diff --git a/invites/testapp/gradle/wrapper/gradle-wrapper.properties b/invites/testapp/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip
diff --git a/messaging/testapp/AndroidManifest.xml b/messaging/testapp/AndroidManifest.xml
@@ -3,7 +3,7 @@
           package="com.google.android.messaging.testapp"
           android:versionCode="1"
           android:versionName="1.0">
-  <uses-sdk android:minSdkVersion="14" android:targetSdkVersion="23" />
+  <uses-sdk android:minSdkVersion="14" android:targetSdkVersion="24" />
   <uses-permission android:name="android.permission.WAKE_LOCK" />
   <uses-permission android:name="com.google.android.c2dm.permission.RECEIVE" />
 
diff --git a/messaging/testapp/build.gradle b/messaging/testapp/build.gradle
@@ -6,8 +6,8 @@ buildscript {
     jcenter()
   }
   dependencies {
-    classpath 'com.android.tools.build:gradle:2.3.1'
-    classpath 'com.google.gms:google-services:3.0.0'
+    classpath 'com.android.tools.build:gradle:3.1.0'
+    classpath 'com.google.gms:google-services:4.0.1'
   }
 }
 
@@ -100,7 +100,7 @@ dependencies {
   compile 'com.google.firebase.messaging.cpp:firebase_messaging_cpp@aar'
   compile 'com.google.firebase:firebase-core:16.0.0'
   compile 'com.google.firebase:firebase-messaging:17.0.0'
-  compile 'com.google.android.gms:play-services-base:15.0.1'
+  compile 'com.google.firebase:firebase-common:16.0.0'
 }
 
 apply plugin: 'com.google.gms.google-services'
diff --git a/messaging/testapp/gradle/wrapper/gradle-wrapper.properties b/messaging/testapp/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip
diff --git a/remote_config/testapp/AndroidManifest.xml b/remote_config/testapp/AndroidManifest.xml
@@ -6,7 +6,7 @@
   <uses-permission android:name="android.permission.INTERNET" />
   <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
   <uses-permission android:name="android.permission.WAKE_LOCK" />
-  <uses-sdk android:minSdkVersion="14" android:targetSdkVersion="23" />
+  <uses-sdk android:minSdkVersion="14" android:targetSdkVersion="24" />
   <application android:label="@string/app_name">
     <activity android:name="android.app.NativeActivity"
               android:screenOrientation="portrait"
diff --git a/remote_config/testapp/build.gradle b/remote_config/testapp/build.gradle
@@ -6,8 +6,8 @@ buildscript {
     jcenter()
   }
   dependencies {
-    classpath 'com.android.tools.build:gradle:2.3.1'
-    classpath 'com.google.gms:google-services:3.0.0'
+    classpath 'com.android.tools.build:gradle:3.1.0'
+    classpath 'com.google.gms:google-services:4.0.1'
   }
 }
 
@@ -93,7 +93,7 @@ android {
 dependencies {
   compile 'com.google.firebase:firebase-core:16.0.0'
   compile 'com.google.firebase:firebase-config:16.0.0'
-  compile 'com.google.android.gms:play-services-base:15.0.1'
+  compile 'com.google.firebase:firebase-common:16.0.0'
 }
 
 apply plugin: 'com.google.gms.google-services'
diff --git a/remote_config/testapp/gradle/wrapper/gradle-wrapper.properties b/remote_config/testapp/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip
diff --git a/storage/testapp/AndroidManifest.xml b/storage/testapp/AndroidManifest.xml
@@ -6,7 +6,7 @@
   <uses-permission android:name="android.permission.INTERNET" />
   <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
   <uses-permission android:name="android.permission.WAKE_LOCK" />
-  <uses-sdk android:minSdkVersion="14" android:targetSdkVersion="23" />
+  <uses-sdk android:minSdkVersion="14" android:targetSdkVersion="24" />
   <application android:label="@string/app_name">
     <activity android:name="android.app.NativeActivity"
               android:screenOrientation="portrait"
diff --git a/storage/testapp/build.gradle b/storage/testapp/build.gradle
@@ -6,8 +6,8 @@ buildscript {
     jcenter()
   }
   dependencies {
-    classpath 'com.android.tools.build:gradle:2.3.1'
-    classpath 'com.google.gms:google-services:3.0.0'
+    classpath 'com.android.tools.build:gradle:3.1.0'
+    classpath 'com.google.gms:google-services:4.0.1'
   }
 }
 
diff --git a/storage/testapp/gradle/wrapper/gradle-wrapper.properties b/storage/testapp/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip
diff --git a/storage/testapp/src/common_main.cc b/storage/testapp/src/common_main.cc
@@ -40,10 +40,14 @@ class StorageListener : public firebase::storage::Listener {
   StorageListener()
       : on_paused_was_called_(false), on_progress_was_called_(false) {}
 
-  // Tracks whether OnPaused was ever called
+  // Tracks whether OnPaused was ever called and resumes the transfer.
   void OnPaused(firebase::storage::Controller* controller) override {
     LogMessage("Paused");
     on_paused_was_called_ = true;
+    LogMessage("INFO: Resuming.");
+    if (!controller->Resume()) {
+      LogMessage("ERROR: Resume() failed.");
+    }
   }
 
   void OnProgress(firebase::storage::Controller* controller) override {
@@ -491,16 +495,7 @@ extern "C" int common_main(int argc, const char* argv[]) {
       // effect immediately, so we give it a few moments to pause before
       // failing.
       LogMessage("INFO: Pausing.");
-      if (controller.Pause()) {
-        ProcessEvents(5000);
-        if (!listener.on_paused_was_called()) {
-          LogMessage("ERROR: Listener OnPaused callback was not called.");
-        }
-        LogMessage("INFO: Resuming.");
-        if (!controller.Resume()) {
-          LogMessage("ERROR: Resume() failed.");
-        }
-      } else {
+      if (!controller.Pause()) {
         LogMessage("ERROR: Pause() failed.");
       }
 

Original file line number	Diff line number	Diff line change
`@@ -6,8 +6,8 @@ buildscript {`
`6`	`6`	`jcenter()`
`7`	`7`	`}`
`8`	`8`	`dependencies {`
`9`		`- classpath 'com.android.tools.build:gradle:2.3.1'`
`10`		`- classpath 'com.google.gms:google-services:3.0.0'`
	`9`	`+ classpath 'com.android.tools.build:gradle:3.1.0'`
	`10`	`+ classpath 'com.google.gms:google-services:4.0.1'`
`11`	`11`	`}`
`12`	`12`	`}`
`13`	`13`
`@@ -92,8 +92,8 @@ android {`
`92`	`92`
`93`	`93`	`dependencies {`
`94`	`94`	`compile 'com.google.firebase:firebase-core:16.0.0'`
`95`		`- compile 'com.google.firebase:firebase-ads:16.0.0'`
`96`		`- compile 'com.google.android.gms:play-services-base:15.0.1'`
	`95`	`+ compile 'com.google.firebase:firebase-ads:15.0.1'`
	`96`	`+ compile 'com.google.firebase:firebase-common:16.0.0'`
`97`	`97`	`}`
`98`	`98`
`99`	`99`	`apply plugin: 'com.google.gms.google-services'`