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

Fix crash when launching about phone v2 through intent

Browse Source 
Change-Id: Ife6c24a7127fc9821760f9f5b58a33437711bc25
Fixes: 73971752
Test: atest
This commit is contained in:
Fan Zhang
2018-02-28 10:03:43 -08:00
parent 6a6cc310cf
commit cfd79a9a7a
5 changed files with 14 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/com/android/settings/SettingsActivity.java
View File

@@ -702,16 +702,16 @@ public class SettingsActivity extends SettingsDrawerActivity
|| somethingChanged;
// Enable/disable the Me Card page.
final boolean isMeCardEnabled = featureFactory
final boolean aboutPhoneV2Enabled = featureFactory
.getAccountFeatureProvider()
.isMeCardEnabled(this);
.isAboutPhoneV2Enabled(this);
somethingChanged = setTileEnabled(new ComponentName(packageName,
Settings.MyDeviceInfoActivity.class.getName()),
isMeCardEnabled, isAdmin)
aboutPhoneV2Enabled, isAdmin)
|| somethingChanged;
somethingChanged = setTileEnabled(new ComponentName(packageName,
Settings.DeviceInfoSettingsActivity.class.getName()),
!isMeCardEnabled, isAdmin)
!aboutPhoneV2Enabled, isAdmin)
|| somethingChanged;
if (UserHandle.MU_ENABLED && !isAdmin) {