From 8df22e7cd9c28d46b60fa345c45297cec9d8c05b Mon Sep 17 00:00:00 2001 From: Kevin Han Date: Tue, 1 Jun 2021 18:53:30 -0700 Subject: [PATCH 1/4] Move unused apps count calculation to bg thread Move the somewhat expensive calculation of the "Unused apps" count to the background thread Initially, the "Unused apps" preference is unavailable. When the bg work finishes and we see we have a non-zero number of unused apps, we display the preference and update the summary text. Bug: 187996287 Test: atest HibernatedAppsPreferenceControllerTest Test: measure latency of displaying preferences w/ custom trace points Change-Id: Idb0d836fd8f4bcdd2605a7d59703a7ed53bcd6d4 --- .../applications/AppDashboardFragment.java | 4 + .../HibernatedAppsPreferenceController.java | 93 +++++++++++++++++-- ...ibernatedAppsPreferenceControllerTest.java | 30 +++++- 3 files changed, 116 insertions(+), 11 deletions(-) diff --git a/src/com/android/settings/applications/AppDashboardFragment.java b/src/com/android/settings/applications/AppDashboardFragment.java index 65f2b61cdd0..ff1259571f6 100644 --- a/src/com/android/settings/applications/AppDashboardFragment.java +++ b/src/com/android/settings/applications/AppDashboardFragment.java @@ -69,6 +69,10 @@ public class AppDashboardFragment extends DashboardFragment { use(SpecialAppAccessPreferenceController.class).setSession(getSettingsLifecycle()); mAppsPreferenceController = use(AppsPreferenceController.class); mAppsPreferenceController.setFragment(this /* fragment */); + + final HibernatedAppsPreferenceController hibernatedAppsPreferenceController = + use(HibernatedAppsPreferenceController.class); + getSettingsLifecycle().addObserver(hibernatedAppsPreferenceController); } @Override diff --git a/src/com/android/settings/applications/HibernatedAppsPreferenceController.java b/src/com/android/settings/applications/HibernatedAppsPreferenceController.java index 8d128112ad7..bf12b86c004 100644 --- a/src/com/android/settings/applications/HibernatedAppsPreferenceController.java +++ b/src/com/android/settings/applications/HibernatedAppsPreferenceController.java @@ -30,40 +30,111 @@ import android.content.pm.PackageManager; import android.provider.DeviceConfig; import android.util.ArrayMap; +import androidx.annotation.NonNull; +import androidx.annotation.WorkerThread; +import androidx.lifecycle.Lifecycle; +import androidx.lifecycle.LifecycleObserver; +import androidx.lifecycle.OnLifecycleEvent; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + import com.android.settings.R; import com.android.settings.core.BasePreferenceController; +import com.google.common.annotations.VisibleForTesting; + import java.util.List; import java.util.Map; +import java.util.concurrent.Executor; +import java.util.concurrent.Executors; import java.util.concurrent.TimeUnit; /** * A preference controller handling the logic for updating summary of hibernated apps. */ -public final class HibernatedAppsPreferenceController extends BasePreferenceController { +public final class HibernatedAppsPreferenceController extends BasePreferenceController + implements LifecycleObserver { private static final String TAG = "HibernatedAppsPrefController"; private static final String PROPERTY_HIBERNATION_UNUSED_THRESHOLD_MILLIS = "auto_revoke_unused_threshold_millis2"; private static final long DEFAULT_UNUSED_THRESHOLD_MS = TimeUnit.DAYS.toMillis(90); + private PreferenceScreen mScreen; + private int mUnusedCount = 0; + private boolean mLoadingUnusedApps; + private final Executor mBackgroundExecutor; + private final Executor mMainExecutor; public HibernatedAppsPreferenceController(Context context, String preferenceKey) { + this(context, preferenceKey, Executors.newSingleThreadExecutor(), + context.getMainExecutor()); + } + + @VisibleForTesting + HibernatedAppsPreferenceController(Context context, String preferenceKey, + Executor bgExecutor, Executor mainExecutor) { super(context, preferenceKey); + mBackgroundExecutor = bgExecutor; + mMainExecutor = mainExecutor; } @Override public int getAvailabilityStatus() { - return isHibernationEnabled() && getNumHibernated() > 0 + return isHibernationEnabled() && mUnusedCount > 0 ? AVAILABLE : CONDITIONALLY_UNAVAILABLE; } @Override public CharSequence getSummary() { - final int numHibernated = getNumHibernated(); return mContext.getResources().getQuantityString( - R.plurals.unused_apps_summary, numHibernated, numHibernated); + R.plurals.unused_apps_summary, mUnusedCount, mUnusedCount); } - private int getNumHibernated() { + @Override + public void displayPreference(PreferenceScreen screen) { + super.displayPreference(screen); + mScreen = screen; + } + + /** + * On lifecycle resume event. + */ + @OnLifecycleEvent(Lifecycle.Event.ON_RESUME) + public void onResume() { + updatePreference(); + } + + private void updatePreference() { + if (mScreen == null) { + return; + } + if (!mLoadingUnusedApps) { + loadUnusedCount(unusedCount -> { + mUnusedCount = unusedCount; + mLoadingUnusedApps = false; + mMainExecutor.execute(() -> { + super.displayPreference(mScreen); + Preference pref = mScreen.findPreference(mPreferenceKey); + refreshSummary(pref); + }); + }); + mLoadingUnusedApps = true; + } + } + + /** + * Asynchronously load the count of unused apps. + * + * @param callback callback to call when the number of unused apps is calculated + */ + private void loadUnusedCount(@NonNull UnusedCountLoadedCallback callback) { + mBackgroundExecutor.execute(() -> { + final int unusedCount = getUnusedCount(); + callback.onUnusedCountLoaded(unusedCount); + }); + } + + @WorkerThread + private int getUnusedCount() { // TODO(b/187465752): Find a way to export this logic from PermissionController module final PackageManager pm = mContext.getPackageManager(); final AppHibernationManager ahm = mContext.getSystemService(AppHibernationManager.class); @@ -71,6 +142,7 @@ public final class HibernatedAppsPreferenceController extends BasePreferenceCont int numHibernated = hibernatedPackages.size(); // Also need to count packages that are auto revoked but not hibernated. + int numAutoRevoked = 0; final UsageStatsManager usm = mContext.getSystemService(UsageStatsManager.class); final long now = System.currentTimeMillis(); final long unusedThreshold = DeviceConfig.getLong(DeviceConfig.NAMESPACE_PERMISSIONS, @@ -97,17 +169,24 @@ public final class HibernatedAppsPreferenceController extends BasePreferenceCont for (String perm : pi.requestedPermissions) { if ((pm.getPermissionFlags(perm, packageName, mContext.getUser()) & PackageManager.FLAG_PERMISSION_AUTO_REVOKED) != 0) { - numHibernated++; + numAutoRevoked++; break; } } } } - return numHibernated; + return numHibernated + numAutoRevoked; } private static boolean isHibernationEnabled() { return DeviceConfig.getBoolean( NAMESPACE_APP_HIBERNATION, PROPERTY_APP_HIBERNATION_ENABLED, false); } + + /** + * Callback for when we've determined the number of unused apps. + */ + private interface UnusedCountLoadedCallback { + void onUnusedCountLoaded(int unusedCount); + } } diff --git a/tests/unit/src/com/android/settings/applications/HibernatedAppsPreferenceControllerTest.java b/tests/unit/src/com/android/settings/applications/HibernatedAppsPreferenceControllerTest.java index 39c966d00f1..06829837a5f 100644 --- a/tests/unit/src/com/android/settings/applications/HibernatedAppsPreferenceControllerTest.java +++ b/tests/unit/src/com/android/settings/applications/HibernatedAppsPreferenceControllerTest.java @@ -41,9 +41,13 @@ import android.content.pm.PackageInfo; import android.content.pm.PackageManager; import android.content.pm.ParceledListSlice; import android.content.res.Resources; +import android.os.Looper; import android.os.RemoteException; import android.provider.DeviceConfig; +import androidx.preference.Preference; +import androidx.preference.PreferenceManager; +import androidx.preference.PreferenceScreen; import androidx.test.core.app.ApplicationProvider; import androidx.test.ext.junit.runners.AndroidJUnit4; @@ -67,12 +71,16 @@ public class HibernatedAppsPreferenceControllerTest { AppHibernationManager mAppHibernationManager; @Mock IUsageStatsManager mIUsageStatsManager; + PreferenceScreen mPreferenceScreen; private static final String KEY = "key"; private Context mContext; private HibernatedAppsPreferenceController mController; @Before public void setUp() { + if (Looper.myLooper() == null) { + Looper.prepare(); + } MockitoAnnotations.initMocks(this); DeviceConfig.setProperty(NAMESPACE_APP_HIBERNATION, PROPERTY_APP_HIBERNATION_ENABLED, "true", false); @@ -82,7 +90,15 @@ public class HibernatedAppsPreferenceControllerTest { .thenReturn(mAppHibernationManager); when(mContext.getSystemService(UsageStatsManager.class)).thenReturn( new UsageStatsManager(mContext, mIUsageStatsManager)); - mController = new HibernatedAppsPreferenceController(mContext, KEY); + + PreferenceManager manager = new PreferenceManager(mContext); + mPreferenceScreen = manager.createPreferenceScreen(mContext); + Preference preference = mock(Preference.class); + when(preference.getKey()).thenReturn(KEY); + mPreferenceScreen.addPreference(preference); + + mController = new HibernatedAppsPreferenceController(mContext, KEY, + command -> command.run(), command -> command.run()); } @Test @@ -100,7 +116,9 @@ public class HibernatedAppsPreferenceControllerTest { Arrays.asList(hibernatedPkg, new PackageInfo())); when(mContext.getResources()).thenReturn(mock(Resources.class)); - mController.getSummary(); + mController.displayPreference(mPreferenceScreen); + mController.onResume(); + verify(mContext.getResources()).getQuantityString(anyInt(), eq(1), eq(1)); } @@ -111,7 +129,9 @@ public class HibernatedAppsPreferenceControllerTest { Arrays.asList(autoRevokedPkg, new PackageInfo())); when(mContext.getResources()).thenReturn(mock(Resources.class)); - mController.getSummary(); + mController.displayPreference(mPreferenceScreen); + mController.onResume(); + verify(mContext.getResources()).getQuantityString(anyInt(), eq(1), eq(1)); } @@ -123,7 +143,9 @@ public class HibernatedAppsPreferenceControllerTest { Arrays.asList(usedAutoRevokedPkg, new PackageInfo())); when(mContext.getResources()).thenReturn(mock(Resources.class)); - mController.getSummary(); + mController.displayPreference(mPreferenceScreen); + mController.onResume(); + verify(mContext.getResources()).getQuantityString(anyInt(), eq(0), eq(0)); } From 47257c05c8d0398d3e9b0e4355290853fabb05cf Mon Sep 17 00:00:00 2001 From: Kevin Chyn Date: Fri, 4 Jun 2021 08:54:32 -0700 Subject: [PATCH 2/4] Remove SUW-specific fingerprint enroll description Bug: b/187460696 Test: adb shell am start -n com.google.android.setupwizard/.SetupWizardTestActivity Change-Id: I5db49dd27439445aae9819dbdd0728ac5c02f0cd --- res/values/strings.xml | 2 -- .../fingerprint/SetupFingerprintEnrollIntroduction.java | 3 --- 2 files changed, 5 deletions(-) diff --git a/res/values/strings.xml b/res/values/strings.xml index fa6e95e9f13..b9a600d8fe4 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -908,8 +908,6 @@ Your phone will occasionally use your recent fingerprint images to create improved fingerprint models. Use your fingerprint to unlock your phone or approve purchases.\n\nNote: You can\u2019t use your fingerprint to unlock this device. For more information, contact your organization\u2019s admin. - - Use your fingerprint to unlock your phone or approve purchases.\n\nNote: Your fingerprint may be less secure than a strong pattern or PIN. Cancel diff --git a/src/com/android/settings/biometrics/fingerprint/SetupFingerprintEnrollIntroduction.java b/src/com/android/settings/biometrics/fingerprint/SetupFingerprintEnrollIntroduction.java index d767d53a5db..e1059119b16 100644 --- a/src/com/android/settings/biometrics/fingerprint/SetupFingerprintEnrollIntroduction.java +++ b/src/com/android/settings/biometrics/fingerprint/SetupFingerprintEnrollIntroduction.java @@ -82,9 +82,6 @@ public class SetupFingerprintEnrollIntroduction extends FingerprintEnrollIntrodu protected void initViews() { super.initViews(); - setDescriptionText( - R.string.security_settings_fingerprint_enroll_introduction_message_setup); - FooterButton nextButton = getNextButton(); nextButton.setText( this, R.string.security_settings_fingerprint_enroll_introduction_continue_setup); From 3e27fd875236bc413c7925d5c80b87b91a82d7c3 Mon Sep 17 00:00:00 2001 From: Kevin Chyn Date: Fri, 4 Jun 2021 10:15:44 -0700 Subject: [PATCH 3/4] Update fingerprint intro drawable Bug: 187460696 Test: manual Change-Id: I92ae38b8851be1e1ad91c9723264249424b9078d --- .../fingerprint_enroll_introduction.xml | 65 ++++++++++--------- 1 file changed, 34 insertions(+), 31 deletions(-) diff --git a/res/drawable/fingerprint_enroll_introduction.xml b/res/drawable/fingerprint_enroll_introduction.xml index 1ad4302cd61..f48d42605fc 100644 --- a/res/drawable/fingerprint_enroll_introduction.xml +++ b/res/drawable/fingerprint_enroll_introduction.xml @@ -1,5 +1,4 @@ - - + android:width="412dp" + android:height="300dp" + android:viewportHeight="300" + android:viewportWidth="412"> + + android:pathData="M206,45.75a38,38,0,0,0-14.87,3h0A38.16,38.16,0,0,0,167.79,84v19.21h7V84A31.17,31.17,0,0,1,193.86,55.2h0a31.24,31.24,0,0,1,38.43,11.93l5.88-3.78A38.08,38.08,0,0,0,206,45.75Z" /> - - - - - - - + android:pathData="M238.18,63.35l-5.89,3.78A31.11,31.11,0,0,1,237.21,84v42.55h7V84A38.11,38.11,0,0,0,238.18,63.35Z" /> - + android:pathData="M271.77,254.25H140.23a14,14,0,0,1-14-14V138.51a14,14,0,0,1,14-14H271.77a14,14,0,0,1,14,14V240.25A14,14,0,0,1,271.77,254.25ZM140.23,128.51a10,10,0,0,0-10,10V240.25a10,10,0,0,0,10,10H271.77a10,10,0,0,0,10-10V138.51a10,10,0,0,0-10-10Z" /> + + + + + \ No newline at end of file From ade59af392f4dc38d8b76b65328b9ca4714c17c6 Mon Sep 17 00:00:00 2001 From: Kevin Chyn Date: Fri, 4 Jun 2021 10:35:33 -0700 Subject: [PATCH 4/4] Update fingerprint/face enrollment to lock icon Bug: 187460696 Test: manual Change-Id: I490ad4246e54ed4ae2e8539e8e9eabba1ccecff6 --- res/values/styles.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/res/values/styles.xml b/res/values/styles.xml index 5fa2f566bdc..6021a7c226e 100644 --- a/res/values/styles.xml +++ b/res/values/styles.xml @@ -369,11 +369,11 @@