diff options
author | zachh <zachh@google.com> | 2017-08-11 15:14:55 -0700 |
---|---|---|
committer | Eric Erfanian <erfanian@google.com> | 2017-08-14 08:30:39 -0700 |
commit | 86d76510112dbd1349b3ab6797febebd179a725b (patch) | |
tree | c7bcf49ea3169ed92e38e9cda7fdc370889a82ee /java/com/android/dialer/strictmode | |
parent | a30dd0f49b2bf63d292c90821c374be34755aeca (diff) |
Fixed some strict mode violations.
Many strict mode violations are due to use of shared preferences on main thread, so we now warm up shared preferences in bypass mode in DialtactsActivity.onCreate. (Note that this shouldn't slow it down because we were already accessing them but without bypassing strict mode.)
I also added a new "storage" module which caches device protected shared prefs. Before we were not caching them and every access was resulting in a disk access, because #createDeviceProtectedStorageContext returns a new context for each call. (Note that this change is required for warming those prefs to work.)
Note that warming up prefs doesn't fix cases where prefs are read from jobs, services, or Application#onCreate (because those things can happen before DialtactsActivity#onCreate) so there is still a need to bypass in those specific places.
Finally, there were various other violations which we now bypass though we probably shouldn't; I'm considering these as being grandfathered in and it would be nice to fix them at some point but today I'd like to just get the app into a usable state so devs can keep strict mode enabled.
Bug: 64118795
Test: manually navigated bugfood build and observed no/fewer crashes
PiperOrigin-RevId: 165031607
Change-Id: I336212a650a7bd93915ebe56a08e976d37818d68
Diffstat (limited to 'java/com/android/dialer/strictmode')
-rw-r--r-- | java/com/android/dialer/strictmode/DialerStrictMode.java | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/java/com/android/dialer/strictmode/DialerStrictMode.java b/java/com/android/dialer/strictmode/DialerStrictMode.java index 3c31aa954..ad1a6c60d 100644 --- a/java/com/android/dialer/strictmode/DialerStrictMode.java +++ b/java/com/android/dialer/strictmode/DialerStrictMode.java @@ -103,4 +103,22 @@ public final class DialerStrictMode { enableDeathPenalty(); } } + + /** + * Convenience method for disabling and enabling the death penalty using lambdas. + * + * <p>For example: + * + * <p><code> + * DialerStrictMode.bypass(() -> doDiskAccessOnMainThread()); + * </code> + */ + public static void bypass(Runnable runnable) { + disableDeathPenalty(); + try { + runnable.run(); + } finally { + enableDeathPenalty(); + } + } } |