Merge "Add stub for android.settings.IGNORE_BATTERY_OPTIMIZATION_SETTINGS" into qt-dev
diff --git a/FrameworkPackageStubs/AndroidManifest.xml b/FrameworkPackageStubs/AndroidManifest.xml
index c73cc7e..a1ab506 100644
--- a/FrameworkPackageStubs/AndroidManifest.xml
+++ b/FrameworkPackageStubs/AndroidManifest.xml
@@ -136,6 +136,16 @@
             </intent-filter>
         </activity>
 
+        <!-- Ignore Battery Optimization Setting -->
+        <activity android:name=".Stubs$IgnoreBatteryOptimizationSettingsStub"
+                  android:label="@string/stub_name"
+                  android:excludeFromRecents="true">
+            <intent-filter android:priority="-1">
+                <action android:name="android.settings.IGNORE_BATTERY_OPTIMIZATION_SETTINGS" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+        </activity>
+
         <!-- WebView Setting -->
         <activity android:name=".Stubs$WebViewSettingsStub"
                   android:label="@string/stub_name"
diff --git a/FrameworkPackageStubs/src/com/android/car/frameworkpackagestubs/Stubs.java b/FrameworkPackageStubs/src/com/android/car/frameworkpackagestubs/Stubs.java
index 32c69e2..2c66e56 100644
--- a/FrameworkPackageStubs/src/com/android/car/frameworkpackagestubs/Stubs.java
+++ b/FrameworkPackageStubs/src/com/android/car/frameworkpackagestubs/Stubs.java
@@ -94,6 +94,11 @@
     public static class SettingsStub extends BaseActivity { }
 
     /**
+     * Stub activity for ignore battery optimization setting.
+     */
+    public static class IgnoreBatteryOptimizationSettingsStub extends BaseActivity { }
+
+    /**
      * Stub activity for webview setting.
      */
     public static class WebViewSettingsStub extends BaseActivity { }