commit 720dc9d6b9f0da405d88e06cff52a7c9b79310de
author Huihong Luo <huisinro@google.com> Tue Jun 04 08:15:26 2019 -0700
committer android-build-merger <android-build-merger@google.com> Tue Jun 04 08:15:26 2019 -0700
tree d1f7d80ef9e25a543162ed05c5de00ea914f4ea7
parent c64ed91953020b64f442c671f974a2e76883bfc9
parent a8d632bd5e68ec77222fe6c7842a69bff826cb64

Merge "Add stub for android.settings.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS" into qt-dev am: 91447af022 am: c2e6320f22
am: a8d632bd5e

Change-Id: Ia74f28d7aa49273f093fe36e4435992edb29365b

FrameworkPackageStubs/AndroidManifest.xml

diff --git a/FrameworkPackageStubs/AndroidManifest.xml b/FrameworkPackageStubs/AndroidManifest.xml
index a1ab506..0f170f8 100644
--- a/FrameworkPackageStubs/AndroidManifest.xml
+++ b/FrameworkPackageStubs/AndroidManifest.xml
@@ -146,6 +146,17 @@
             </intent-filter>
         </activity>
 
+        <!-- Ignore Battery Optimization Setting -->
+        <activity android:name=".Stubs$RequestIgnoreBatteryOptimizationsStub"
+                  android:label="@string/stub_name"
+                  android:excludeFromRecents="true">
+            <intent-filter android:priority="-1">
+                <action android:name="android.settings.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <data android:scheme="package" />
+            </intent-filter>
+        </activity>
+
         <!-- WebView Setting -->
         <activity android:name=".Stubs$WebViewSettingsStub"
                   android:label="@string/stub_name"

FrameworkPackageStubs/src/com/android/car/frameworkpackagestubs/Stubs.java

diff --git a/FrameworkPackageStubs/src/com/android/car/frameworkpackagestubs/Stubs.java b/FrameworkPackageStubs/src/com/android/car/frameworkpackagestubs/Stubs.java
index 2c66e56..a79e4fb 100644
--- a/FrameworkPackageStubs/src/com/android/car/frameworkpackagestubs/Stubs.java
+++ b/FrameworkPackageStubs/src/com/android/car/frameworkpackagestubs/Stubs.java
@@ -99,6 +99,11 @@
     public static class IgnoreBatteryOptimizationSettingsStub extends BaseActivity { }
 
     /**
+     * Stub activity for request ignore battery optimization.
+     */
+    public static class RequestIgnoreBatteryOptimizationsStub extends BaseActivity { }
+
+    /**
      * Stub activity for webview setting.
      */
     public static class WebViewSettingsStub extends BaseActivity { }