2 files changed, 10 insertions, 14 deletions
diff --git a/java/src/com/android/intentresolver/v2/ChooserActivity.java b/java/src/com/android/intentresolver/v2/ChooserActivity.java
index 8387212a..7b5ff541 100644
--- a/java/src/com/android/intentresolver/v2/ChooserActivity.java
+++ b/java/src/com/android/intentresolver/v2/ChooserActivity.java
@@ -358,7 +358,7 @@ public class ChooserActivity extends Hilt_ChooserActivity implements
     }
 
     @Override
-    protected final void onCreate(Bundle savedInstanceState) {
+    protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         Log.i(TAG, "onCreate");
         mViewModel = new ViewModelProvider(this).get(ChooserViewModel.class);
@@ -491,7 +491,7 @@ public class ChooserActivity extends Hilt_ChooserActivity implements
     }
 
     @Override
-    protected final void onDestroy() {
+    protected void onDestroy() {
         super.onDestroy();
 
         if (isFinishing()) {
@@ -1265,16 +1265,6 @@ public class ChooserActivity extends Hilt_ChooserActivity implements
         };
     }
 
-    public void super_onConfigurationChanged(Configuration newConfig) {
-        super.onConfigurationChanged(newConfig);
-        mChooserMultiProfilePagerAdapter.getActiveListAdapter().handlePackagesChanged();
-
-        if (mSystemWindowInsets != null) {
-            mResolverDrawerLayout.setPadding(mSystemWindowInsets.left, mSystemWindowInsets.top,
-                    mSystemWindowInsets.right, 0);
-        }
-    }
-
     //////////////////////////////////////////////////////////////////////////////////////////////
     //////////////////////////////////////////////////////////////////////////////////////////////
 
@@ -1512,7 +1502,13 @@ public class ChooserActivity extends Hilt_ChooserActivity implements
 
     @Override
     public void onConfigurationChanged(Configuration newConfig) {
-        super_onConfigurationChanged(newConfig);
+        super.onConfigurationChanged(newConfig);
+        mChooserMultiProfilePagerAdapter.getActiveListAdapter().handlePackagesChanged();
+
+        if (mSystemWindowInsets != null) {
+            mResolverDrawerLayout.setPadding(mSystemWindowInsets.left, mSystemWindowInsets.top,
+                    mSystemWindowInsets.right, 0);
+        }
         ViewPager viewPager = findViewById(com.android.internal.R.id.profile_pager);
         if (viewPager.isLayoutRtl()) {
             mChooserMultiProfilePagerAdapter.setupViewPager(viewPager);
diff --git a/java/src/com/android/intentresolver/v2/ResolverActivity.java b/java/src/com/android/intentresolver/v2/ResolverActivity.java
index a9d9f8b1..0182fc89 100644
--- a/java/src/com/android/intentresolver/v2/ResolverActivity.java
+++ b/java/src/com/android/intentresolver/v2/ResolverActivity.java
@@ -238,7 +238,7 @@ public class ResolverActivity extends Hilt_ResolverActivity implements
     }
 
     @Override
-    protected final void onCreate(Bundle savedInstanceState) {
+    protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setTheme(R.style.Theme_DeviceDefault_Resolver);
         mActivityModel = createActivityModel();