commit f60622b40189f7f39cee5fe160aafe64f76bff18
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Fri Nov 15 00:38:23 2024 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Nov 15 00:38:23 2024 +0000
tree 9db82fcd52b932315713cbec1b8a569e491a184a
parent e77374ec610130a287b446e4867b3c1e7f16df10
parent 82558639478bd80b7f08c6fb20dc07838c10def3

Merge "Fix initialization order" into main

src/com/android/car/rotary/RotaryService.java

diff --git a/src/com/android/car/rotary/RotaryService.java b/src/com/android/car/rotary/RotaryService.java
index c85e893..76b610e 100644
--- a/src/com/android/car/rotary/RotaryService.java
+++ b/src/com/android/car/rotary/RotaryService.java
@@ -592,6 +592,13 @@
     public void onCreate() {
         L.v("onCreate");
         super.onCreate();
+        if (getBaseContext() != null) {
+            mContentResolver = getContentResolver();
+        }
+        if (mContentResolver == null) {
+            L.w("ContentResolver not available");
+        }
+
         Resources res = getResources();
         mRotationAcceleration3xMs = res.getInteger(R.integer.rotation_acceleration_3x_ms);
         mRotationAcceleration2xMs = res.getInteger(R.integer.rotation_acceleration_2x_ms);
@@ -678,13 +685,6 @@
         filter.addAction(Intent.ACTION_PACKAGE_REMOVED);
         filter.addDataScheme("package");
         registerReceiver(mAppInstallUninstallReceiver, filter);
-
-        if (getBaseContext() != null) {
-            mContentResolver = getContentResolver();
-        }
-        if (mContentResolver == null) {
-            L.w("ContentResolver not available");
-        }
     }
 
     /**