PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Hide the app details preference for mainline module apps" into rvc-dev

Browse Source
This commit is contained in:
Yanting Yang
2020-05-07 08:41:39 +00:00
committed by Android (Google) Code Review
parent cae9a9c2fb 172f4064a9
commit cf33b4bc5e
2 changed files with 18 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/com/android/settings/applications/appinfo/AppInstallerInfoPreferenceController.java
View File

@@ -42,6 +42,11 @@ public class AppInstallerInfoPreferenceController extends AppInfoPreferenceContr
if (UserManager.get(mContext).isManagedProfile()) { if (UserManager.get(mContext).isManagedProfile()) {
return DISABLED_FOR_USER; return DISABLED_FOR_USER;
} }
if (AppUtils.isMainlineModule(mContext, mPackageName)) {
return DISABLED_FOR_USER;
}
return mInstallerLabel != null ? AVAILABLE : DISABLED_FOR_USER; return mInstallerLabel != null ? AVAILABLE : DISABLED_FOR_USER;
} }

13
tests/robotests/src/com/android/settings/applications/appinfo/AppInstallerInfoPreferenceControllerTest.java
View File

@@ -32,6 +32,7 @@ import android.content.Context;
import android.content.Intent; import android.content.Intent;
import android.content.pm.ActivityInfo; import android.content.pm.ActivityInfo;
import android.content.pm.ApplicationInfo; import android.content.pm.ApplicationInfo;
import android.content.pm.ModuleInfo;
import android.content.pm.PackageInfo; import android.content.pm.PackageInfo;
import android.content.pm.PackageManager; import android.content.pm.PackageManager;
import android.content.pm.ResolveInfo; import android.content.pm.ResolveInfo;
@@ -148,4 +149,16 @@ public class AppInstallerInfoPreferenceControllerTest {
verify(mPreference, never()).setEnabled(false); verify(mPreference, never()).setEnabled(false);
verify(mPreference).setIntent(any(Intent.class)); verify(mPreference).setIntent(any(Intent.class));
} }
@Test
public void getAvailabilityStatus_isMainlineModule_shouldReturnDisabled()
throws PackageManager.NameNotFoundException {
when(mUserManager.isManagedProfile()).thenReturn(false);
when(mAppInfo.loadLabel(mPackageManager)).thenReturn("Label");
mController.setPackageName("Package");
when(mPackageManager.getModuleInfo("Package", 0 /* flags */)).thenReturn(new ModuleInfo());
assertThat(mController.getAvailabilityStatus()).isEqualTo(
BasePreferenceController.DISABLED_FOR_USER);
}
} }