commit 10f4760b806ea71770fd703d73f282ace8e62b13
author Mark Renouf <mrenouf@google.com> Fri Mar 08 16:13:43 2024 -0500
committer Mark Renouf <mrenouf@google.com> Fri Mar 08 21:45:13 2024 +0000
tree 2cb7ce8a32821c3b3ca688f52ee9007de7e6cf85
parent 17e885ca0179f54e51ba6f5c07cf459868fe6c43

Remove final from framework methods

Hilt generates a base class and somehow inherits the final modifier
in the process, causes compilation to fail when final methods are
overridden in the generated class hierarchy.

There errors from dagger generated classes were:

error: onCreate(Bundle) in ChooserActivity cannot override onCreate(Bundle) in Hilt_ChooserActivity
  overridden method is final

error: onDestroy() in ChooserActivity cannot override onDestroy() in Hilt_ChooserActivity
  overridden method is final

error: onCreate(Bundle) in ResolverActivity cannot override onCreate(Bundle) in Hilt_ResolverActivity
    protected final void onCreate(Bundle savedInstanceState) {

Flag: NA
Test: atest IntentResolver-tests-activity:com.android.intentresolver.v2
Bug: NA
Change-Id: Id925938ab9ce48caaa451a943547f1912058cfdf

java/src/com/android/intentresolver/v2/ChooserActivity.java

diff --git a/java/src/com/android/intentresolver/v2/ChooserActivity.java b/java/src/com/android/intentresolver/v2/ChooserActivity.java
index 9a5ec17..510e6d1 100644
--- a/java/src/com/android/intentresolver/v2/ChooserActivity.java
+++ b/java/src/com/android/intentresolver/v2/ChooserActivity.java
@@ -344,7 +344,7 @@
     }
 
     @Override
-    protected final void onCreate(Bundle savedInstanceState) {
+    protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         Log.i(TAG, "onCreate");
 
@@ -444,7 +444,7 @@
     }
 
     @Override
-    protected final void onDestroy() {
+    protected void onDestroy() {
         super.onDestroy();
         if (!isChangingConfigurations() && mPickOptionRequest != null) {
             mPickOptionRequest.cancel();
@@ -1181,16 +1181,6 @@
         };
     }
 
-    public void super_onConfigurationChanged(Configuration newConfig) {
-        super.onConfigurationChanged(newConfig);
-        mChooserMultiProfilePagerAdapter.getActiveListAdapter().handlePackagesChanged();
-
-        if (mSystemWindowInsets != null) {
-            mResolverDrawerLayout.setPadding(mSystemWindowInsets.left, mSystemWindowInsets.top,
-                    mSystemWindowInsets.right, 0);
-        }
-    }
-
     //////////////////////////////////////////////////////////////////////////////////////////////
     //////////////////////////////////////////////////////////////////////////////////////////////
 
@@ -1407,7 +1397,13 @@
 
     @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);

java/src/com/android/intentresolver/v2/ResolverActivity.java

diff --git a/java/src/com/android/intentresolver/v2/ResolverActivity.java b/java/src/com/android/intentresolver/v2/ResolverActivity.java
index be3d7ce..4e694c3 100644
--- a/java/src/com/android/intentresolver/v2/ResolverActivity.java
+++ b/java/src/com/android/intentresolver/v2/ResolverActivity.java
@@ -238,7 +238,7 @@
     }
 
     @Override
-    protected final void onCreate(Bundle savedInstanceState) {
+    protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setTheme(R.style.Theme_DeviceDefault_Resolver);
         mActivityModel = createActivityModel();