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

Merge "Make EuiccService un-disable-able."

Browse Source
This commit is contained in:
TreeHugger Robot
2019-08-06 14:56:22 +00:00
committed by Android (Google) Code Review
parent 2862e79478 7e2978ab58
commit e69ef50ba2
2 changed files with 68 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/com/android/settings/applications/ApplicationFeatureProviderImpl.java
View File

@@ -33,6 +33,7 @@ import android.text.TextUtils;
import android.util.ArraySet;
import com.android.internal.telephony.SmsApplication;
import com.android.internal.telephony.euicc.EuiccConnector;
import com.android.settings.R;
import java.util.ArrayList;
@@ -141,6 +142,12 @@ public class ApplicationFeatureProviderImpl implements ApplicationFeatureProvide
keepEnabledPackages.add(defaultSms.getPackageName());
}
// Keep Euicc Service enabled.
final ComponentInfo euicc = EuiccConnector.findBestComponent(mPm);
if (euicc != null) {
keepEnabledPackages.add(euicc.packageName);
}
keepEnabledPackages.addAll(getEnabledPackageWhitelist());
final LocationManager locationManager =