AllInOneActivity: Don't request disabling doze on pre-M devices

Signed-off-by: Aayush Gupta <[email protected]>
Etar-Group · Nov 1, 2023 · cea9416 · cea9416
1 parent 09463e5
commit cea9416
Showing 1 changed file with 9 additions and 2 deletions.
diff --git a/app/src/main/java/com/android/calendar/AllInOneActivity.java b/app/src/main/java/com/android/calendar/AllInOneActivity.java
@@ -65,6 +65,7 @@
 import android.widget.TextView;
 import android.widget.Toast;
 
+import androidx.annotation.RequiresApi;
 import androidx.appcompat.app.ActionBar;
 import androidx.appcompat.widget.SearchView;
 import androidx.appcompat.widget.Toolbar;
@@ -423,6 +424,7 @@ private void checkAppPermissions() {
 
     }
 
+    @RequiresApi(Build.VERSION_CODES.M)
     private void checkAndRequestDisablingDoze() {
         if (!dozeDisabled()) {
             Intent intent = new Intent();
@@ -433,6 +435,7 @@ private void checkAndRequestDisablingDoze() {
     }
 
     private Boolean dozeDisabled() {
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.M) return true;
         String packageName = getApplicationContext().getPackageName();
         PowerManager pm = (PowerManager) getApplicationContext().getSystemService(Context.POWER_SERVICE);
         return pm.isIgnoringBatteryOptimizations(packageName);
@@ -450,7 +453,9 @@ public void onRequestPermissionsResult(int requestCode,
                     // permission was granted, yay!
 
                     // Check and ask to disable battery optimizations
-                    checkAndRequestDisablingDoze();
+                    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+                        checkAndRequestDisablingDoze();
+                    }
 
                 } else {
                     Toast.makeText(getApplicationContext(), R.string.user_rejected_calendar_write_permission, Toast.LENGTH_LONG).show();
@@ -974,7 +979,9 @@ public void onDateSet(DatePicker view, int year, int monthOfYear, int dayOfMonth
             intent.putExtra(SettingsActivityKt.EXTRA_SHOW_FRAGMENT, ViewDetailsPreferences.class.getName());
             startActivity(intent);
         } else if (itemId == R.id.action_info) {
-            checkAndRequestDisablingDoze();
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+                checkAndRequestDisablingDoze();
+            }
         } else {
                 return mExtensions.handleItemSelected(item, this);
         }