diff options
author | Colin Marsch <colinmarsch@google.com> | 2020-08-17 15:55:06 -0500 |
---|---|---|
committer | Michael Bestas <mkbestas@lineageos.org> | 2020-12-08 19:39:11 +0200 |
commit | c6da36afffb5a683e4ed14b66147822b6737efb7 (patch) | |
tree | add0af53c40254a0b4779f44d239106097ea21d8 | |
parent | 676ae03d8722bc6830a8c150e795cc6adf3710ea (diff) |
AOSP/DeskClock - Upgrade Handler inits to use undeprecated constructor
Test: manual, tested the DeskClock UI. As well tests were ran as follows
$ source build/envsetup.sh
$ lunch aosp_sargo-userdebug
$ make DeskClock
$ adb install out/target/product/sargo/product/app/DeskClock/DeskClock.apk
$ atest DeskClockTests
$ make DeskClockJava
$ adb install out/target/product/sargo/product/app/DeskClockJava/DeskClockJava.apk
$ atest DeskClockTests
BUG: 157255731
Change-Id: I85888a5c511a277cfb17f8a3e431ec5b11ea6bd8
7 files changed, 17 insertions, 10 deletions
diff --git a/src/com/android/deskclock/Screensaver.java b/src/com/android/deskclock/Screensaver.java index 427885e68..68899d96e 100644 --- a/src/com/android/deskclock/Screensaver.java +++ b/src/com/android/deskclock/Screensaver.java @@ -25,6 +25,7 @@ import android.content.res.Configuration; import android.database.ContentObserver; import android.net.Uri; import android.os.Handler; +import android.os.Looper; import android.provider.Settings; import android.service.dreams.DreamService; import android.view.View; @@ -51,7 +52,7 @@ public final class Screensaver extends DreamService { /* Register ContentObserver to see alarm changes for pre-L */ private final ContentObserver mSettingsContentObserver = - Utils.isLOrLater() ? null : new ContentObserver(new Handler()) { + Utils.isLOrLater() ? null : new ContentObserver(new Handler(Looper.myLooper())) { @Override public void onChange(boolean selfChange) { Utils.refreshAlarm(Screensaver.this, mContentView); diff --git a/src/com/android/deskclock/ScreensaverActivity.java b/src/com/android/deskclock/ScreensaverActivity.java index 656cfc718..c7d54af3f 100644 --- a/src/com/android/deskclock/ScreensaverActivity.java +++ b/src/com/android/deskclock/ScreensaverActivity.java @@ -25,6 +25,7 @@ import android.database.ContentObserver; import android.net.Uri; import android.os.Bundle; import android.os.Handler; +import android.os.Looper; import android.provider.Settings; import android.view.View; import android.view.ViewTreeObserver.OnPreDrawListener; @@ -74,7 +75,7 @@ public class ScreensaverActivity extends BaseActivity { /* Register ContentObserver to see alarm changes for pre-L */ private final ContentObserver mSettingsContentObserver = Utils.isPreL() - ? new ContentObserver(new Handler()) { + ? new ContentObserver(new Handler(Looper.myLooper())) { @Override public void onChange(boolean selfChange) { Utils.refreshAlarm(ScreensaverActivity.this, mContentView); diff --git a/src/com/android/deskclock/alarms/AlarmActivity.java b/src/com/android/deskclock/alarms/AlarmActivity.java index 88632c77a..916fb9274 100644 --- a/src/com/android/deskclock/alarms/AlarmActivity.java +++ b/src/com/android/deskclock/alarms/AlarmActivity.java @@ -37,9 +37,7 @@ import android.media.AudioManager; import android.os.Bundle; import android.os.Handler; import android.os.IBinder; -import androidx.annotation.NonNull; -import androidx.core.graphics.ColorUtils; -import androidx.core.view.animation.PathInterpolatorCompat; +import android.os.Looper; import android.view.KeyEvent; import android.view.MotionEvent; import android.view.View; @@ -49,6 +47,9 @@ import android.view.accessibility.AccessibilityManager; import android.widget.ImageView; import android.widget.TextClock; import android.widget.TextView; +import androidx.annotation.NonNull; +import androidx.core.graphics.ColorUtils; +import androidx.core.view.animation.PathInterpolatorCompat; import com.android.deskclock.AnimatorUtils; import com.android.deskclock.BaseActivity; @@ -85,7 +86,7 @@ public class AlarmActivity extends BaseActivity private static final float BUTTON_SCALE_DEFAULT = 0.7f; private static final int BUTTON_DRAWABLE_ALPHA_DEFAULT = 165; - private final Handler mHandler = new Handler(); + private final Handler mHandler = new Handler(Looper.myLooper()); private final BroadcastReceiver mReceiver = new BroadcastReceiver() { @Override public void onReceive(Context context, Intent intent) { diff --git a/src/com/android/deskclock/data/AlarmModel.java b/src/com/android/deskclock/data/AlarmModel.java index da50fe550..a320d7d78 100644 --- a/src/com/android/deskclock/data/AlarmModel.java +++ b/src/com/android/deskclock/data/AlarmModel.java @@ -21,6 +21,7 @@ import android.content.Context; import android.database.ContentObserver; import android.net.Uri; import android.os.Handler; +import android.os.Looper; import android.provider.Settings; import com.android.deskclock.data.DataModel.AlarmVolumeButtonBehavior; @@ -85,7 +86,7 @@ final class AlarmModel { private final class SystemAlarmAlertChangeObserver extends ContentObserver { private SystemAlarmAlertChangeObserver() { - super(new Handler()); + super(new Handler(Looper.myLooper())); } @Override diff --git a/src/com/android/deskclock/data/RingtoneModel.java b/src/com/android/deskclock/data/RingtoneModel.java index 90b7f912c..f656eb866 100644 --- a/src/com/android/deskclock/data/RingtoneModel.java +++ b/src/com/android/deskclock/data/RingtoneModel.java @@ -30,6 +30,7 @@ import android.media.Ringtone; import android.media.RingtoneManager; import android.net.Uri; import android.os.Handler; +import android.os.Looper; import android.provider.Settings; import android.util.ArrayMap; import android.util.ArraySet; @@ -206,7 +207,7 @@ final class RingtoneModel { private final class SystemAlarmAlertChangeObserver extends ContentObserver { private SystemAlarmAlertChangeObserver() { - super(new Handler()); + super(new Handler(Looper.myLooper())); } @Override diff --git a/src/com/android/deskclock/data/SilentSettingsModel.java b/src/com/android/deskclock/data/SilentSettingsModel.java index b50702af2..50054f134 100644 --- a/src/com/android/deskclock/data/SilentSettingsModel.java +++ b/src/com/android/deskclock/data/SilentSettingsModel.java @@ -30,6 +30,7 @@ import android.net.Uri; import android.os.AsyncTask; import android.os.Build; import android.os.Handler; +import android.os.Looper; import androidx.core.app.NotificationManagerCompat; import com.android.deskclock.Utils; @@ -225,7 +226,7 @@ final class SilentSettingsModel { */ private final class ContentChangeWatcher extends ContentObserver { private ContentChangeWatcher() { - super(new Handler()); + super(new Handler(Looper.myLooper())); } @Override diff --git a/src/com/android/deskclock/uidata/PeriodicCallbackModel.java b/src/com/android/deskclock/uidata/PeriodicCallbackModel.java index 4b522d199..a8232e315 100644 --- a/src/com/android/deskclock/uidata/PeriodicCallbackModel.java +++ b/src/com/android/deskclock/uidata/PeriodicCallbackModel.java @@ -21,6 +21,7 @@ import android.content.Context; import android.content.Intent; import android.content.IntentFilter; import android.os.Handler; +import android.os.Looper; import androidx.annotation.VisibleForTesting; import com.android.deskclock.LogUtils; @@ -172,7 +173,7 @@ final class PeriodicCallbackModel { private static Handler getHandler() { enforceMainLooper(); if (sHandler == null) { - sHandler = new Handler(); + sHandler = new Handler(Looper.myLooper()); } return sHandler; } |