From a899ae827b670e462b7c488fcbb0095059b9adf6 Mon Sep 17 00:00:00 2001
From: Amith Dsouza <amithds@google.com>
Date: Tue, 9 Aug 2022 17:02:55 +0000
Subject: Update targetSDKlevel to 30

When the targetSDKlevel is updated, changes are required
in setting notifications for timers.

Updated the logic to build, set and trigger notificaitons
for timers to prevent issues that were reported in bugs
like b/199822689

This is the first in a series of patches that will try to
bump the targetSDKlevel to 33

Multiple manual tests run to check functionality.

Bug: 239910985
Test: adb shell am instrument -w com.android.deskclock.tests
Change-Id: I1528bb3e0189b8d72a9025526af558bfe4aec4eb
---
 Android.bp                                         |  2 +-
 AndroidManifest.xml                                | 11 +---------
 src/com/android/deskclock/data/TimerModel.kt       | 25 +++++++++++++++-------
 .../deskclock/data/TimerNotificationBuilder.kt     | 13 ++++++++++-
 4 files changed, 31 insertions(+), 20 deletions(-)

diff --git a/Android.bp b/Android.bp
index a6e42742e..235bad983 100644
--- a/Android.bp
+++ b/Android.bp
@@ -7,7 +7,7 @@ android_app {
     name: "DeskClock",
     resource_dirs: ["res"],
     sdk_version: "current",
-    target_sdk_version: "24",
+    target_sdk_version: "30",
     overrides: [
         "AlarmClock",
     ],
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 098637b75..82174a987 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -22,7 +22,7 @@
     <original-package android:name="com.android.alarmclock" />
     <original-package android:name="com.android.deskclock" />
 
-    <uses-sdk android:minSdkVersion="23" android:targetSdkVersion="24" />
+    <uses-sdk android:minSdkVersion="23" android:targetSdkVersion="30" />
 
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
     <uses-permission android:name="android.permission.WAKE_LOCK" />
@@ -34,15 +34,6 @@
     <uses-permission android:name="android.permission.SCHEDULE_EXACT_ALARM" />
     <uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS" />
 
-    <!-- WRITE_SETTINGS is required to record the upcoming alarm prior to L -->
-    <uses-permission
-        android:name="android.permission.WRITE_SETTINGS"
-        android:maxSdkVersion="19" />
-    <!-- READ_PHONE_STATE is required to determine when a phone call exists prior to M -->
-    <uses-permission
-        android:name="android.permission.READ_PHONE_STATE"
-        android:maxSdkVersion="22" />
-
     <application
         android:name=".DeskClockApplication"
         android:allowBackup="false"
diff --git a/src/com/android/deskclock/data/TimerModel.kt b/src/com/android/deskclock/data/TimerModel.kt
index 08f6fb1ef..dae15102e 100644
--- a/src/com/android/deskclock/data/TimerModel.kt
+++ b/src/com/android/deskclock/data/TimerModel.kt
@@ -683,12 +683,6 @@ internal class TimerModel(
      * when the application is not open.
      */
     fun updateNotification() {
-        // Notifications should be hidden if the app is open.
-        if (mNotificationModel.isApplicationInForeground) {
-            mNotificationManager.cancel(mNotificationModel.unexpiredTimerNotificationId)
-            return
-        }
-
         // Filter the timers to just include unexpired ones.
         val unexpired: MutableList<Timer> = mutableListOf()
         for (timer in mutableTimers) {
@@ -699,18 +693,33 @@ internal class TimerModel(
 
         // If no unexpired timers exist, cancel the notification.
         if (unexpired.isEmpty()) {
-            mNotificationManager.cancel(mNotificationModel.unexpiredTimerNotificationId)
+            if(mNotificationBuilder.isChannelCreated(mNotificationManager)) {
+                LogUtils.i("Cancelling Notifications when list is empty")
+                mNotificationManager.cancel(mNotificationModel.unexpiredTimerNotificationId)
+            }
             return
         }
 
         // Sort the unexpired timers to locate the next one scheduled to expire.
         unexpired.sortWith(Timer.EXPIRY_COMPARATOR)
 
+        //Build and setup a channel for notifications
+        LogUtils.i("Channel being setup!!!!")
         // Otherwise build and post a notification reflecting the latest unexpired timers.
         val notification: Notification =
                 mNotificationBuilder.build(mContext, mNotificationModel, unexpired)
         val notificationId = mNotificationModel.unexpiredTimerNotificationId
         mNotificationBuilder.buildChannel(mContext, mNotificationManager)
+
+        // Notifications should be hidden if the app is open.
+        if (mNotificationModel.isApplicationInForeground) {
+            if(mNotificationBuilder.isChannelCreated(mNotificationManager)) {
+                LogUtils.i("Cancelling notifications when the app is in foreground")
+                mNotificationManager.cancel(mNotificationModel.unexpiredTimerNotificationId)
+            }
+            return
+        }
+
         mNotificationManager.notify(notificationId, notification)
     }
 
@@ -806,4 +815,4 @@ internal class TimerModel(
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/com/android/deskclock/data/TimerNotificationBuilder.kt b/src/com/android/deskclock/data/TimerNotificationBuilder.kt
index 98e2a92e2..66601cf82 100644
--- a/src/com/android/deskclock/data/TimerNotificationBuilder.kt
+++ b/src/com/android/deskclock/data/TimerNotificationBuilder.kt
@@ -50,6 +50,17 @@ import com.android.deskclock.timer.TimerService
  */
 internal class TimerNotificationBuilder {
 
+    fun isChannelCreated(notificationManager: NotificationManagerCompat): Boolean {
+        if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.O) {
+            if(notificationManager.getNotificationChannelCompat(TIMER_MODEL_NOTIFICATION_CHANNEL_ID) != null) {
+                return true
+            } else {
+                return false
+            }
+        }
+        return false
+    }
+
     fun buildChannel(context: Context, notificationManager: NotificationManagerCompat) {
         if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.O) {
             val channel = NotificationChannel(
@@ -420,4 +431,4 @@ internal class TimerNotificationBuilder {
             return SystemClock.elapsedRealtime() + adjustedRemaining
         }
     }
-}
\ No newline at end of file
+}
-- 
cgit v1.2.3


From 7ab78adfa681e9e285a348159cec09f1f23698fe Mon Sep 17 00:00:00 2001
From: Amith Dsouza <amithds@google.com>
Date: Tue, 9 Aug 2022 20:03:55 +0000
Subject: Update OWNERS files

Add more members from the team for better
coverage of approvals.

Bug: None
Test: None needed
Change-Id: I976533b061ab22650a037ff960eaef2891b612cf
---
 OWNERS | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/OWNERS b/OWNERS
index fe9f33f03..6c60e5a92 100644
--- a/OWNERS
+++ b/OWNERS
@@ -1,3 +1,5 @@
 # This project has no significant updates recently.
 # Please update this list if you find better candidates.
+iankaz@google.com
+amithds@google.com
 rtenneti@google.com
-- 
cgit v1.2.3