Adjust adoptions

app/build.gradle

@@ -51,6 +51,11 @@ dexcount {
 
 android {
 
+    adbOptions {
+        timeOutInMs 15 * 60 * 1000  // 15 minutes
+        installOptions "-d","-t"
+    }
+
     testOptions {
         // Allows Android code to be called from unit tests without causing a crash.
         // Helpful for allowing Log.d()-type calls

grant-set-animation-scale-permission.gradle

@@ -0,0 +1,30 @@
+/*
+ * Copyright 2015 Google Inc. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+def adb = android.getAdbExe().toString()
+
+task grantSetAnimationScalePermission(type: Exec, dependsOn: 'installDebug') {
+    group = 'verification'
+    description = 'Grant SET_ANIMATION_SCALE permission for testing.'
+    def saspermission = 'android.permission.SET_ANIMATION_SCALE'
+    commandLine "$adb shell pm grant $android.defaultConfig.applicationId $saspermission".split(' ')
+}
+
+tasks.whenTaskAdded { task ->
+    if (task.name.startsWith('connectedDebugAndroidTest')) {
+        task.dependsOn grantSetAnimationScalePermission
+    }
+}