From 10f4760b806ea71770fd703d73f282ace8e62b13 Mon Sep 17 00:00:00 2001 From: Mark Renouf Date: Fri, 8 Mar 2024 16:13:43 -0500 Subject: 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 --- .../android/intentresolver/v2/ChooserActivity.java | 22 +++++++++------------- .../intentresolver/v2/ResolverActivity.java | 2 +- 2 files changed, 10 insertions(+), 14 deletions(-) (limited to 'java/src') diff --git a/java/src/com/android/intentresolver/v2/ChooserActivity.java b/java/src/com/android/intentresolver/v2/ChooserActivity.java index 9a5ec173..510e6d14 100644 --- a/java/src/com/android/intentresolver/v2/ChooserActivity.java +++ b/java/src/com/android/intentresolver/v2/ChooserActivity.java @@ -344,7 +344,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"); @@ -444,7 +444,7 @@ public class ChooserActivity extends Hilt_ChooserActivity implements } @Override - protected final void onDestroy() { + protected void onDestroy() { super.onDestroy(); if (!isChangingConfigurations() && mPickOptionRequest != null) { mPickOptionRequest.cancel(); @@ -1181,16 +1181,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); - } - } - ////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////////// @@ -1407,7 +1397,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 be3d7ce9..4e694c3a 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(); -- cgit v1.2.3-59-g8ed1b