Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Allow configuration of which package to handle FACTORY_RESET intent."

Browse Source
This commit is contained in:
Ben Lin
2019-06-24 22:32:42 +00:00
committed by Android (Google) Code Review
parent 7b5c1c96e6 ba49b199de
commit 188cea124e
3 changed files with 16 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/res/res/values/config.xml
View File

@@ -4172,4 +4172,8 @@
one bar higher than they actually are -->
<bool name="config_inflateSignalStrength">false</bool>
<!-- The package name for the vendor implementation of ACTION_FACTORY_RESET. For some vendors,
the default implementation of ACTION_FACTORY_RESET does not work, so it is needed to re-route
this intent to this package. This is being used in MasterClearReceiver.java. -->
<string name="config_factoryResetPackage" translatable="false"></string>
</resources>

1
core/res/res/values/symbols.xml
View File

@@ -3813,4 +3813,5 @@
<java-symbol type="string" name="config_defaultSupervisionProfileOwnerComponent" />
<java-symbol type="bool" name="config_inflateSignalStrength" />
<java-symbol type="string" name="config_factoryResetPackage" />
</resources>

16
services/core/java/com/android/server/MasterClearReceiver.java
View File

@@ -16,16 +16,15 @@
package com.android.server;
import android.app.PendingIntent;
import android.app.ProgressDialog;
import android.content.BroadcastReceiver;
import android.content.Context;
import android.content.Intent;
import android.os.AsyncTask;
import android.os.RecoverySystem;
import android.os.UserHandle;
import android.os.storage.StorageManager;
import android.provider.Settings;
import android.telephony.euicc.EuiccManager;
import android.text.TextUtils;
import android.util.Log;
import android.util.Slog;
import android.view.WindowManager;
@@ -33,8 +32,6 @@ import android.view.WindowManager;
import com.android.internal.R;
import java.io.IOException;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
public class MasterClearReceiver extends BroadcastReceiver {
private static final String TAG = "MasterClear";
@@ -58,6 +55,15 @@ public class MasterClearReceiver extends BroadcastReceiver {
+ "Intent#EXTRA_FORCE_FACTORY_RESET should be used instead.");
}
final String factoryResetPackage = context
.getString(com.android.internal.R.string.config_factoryResetPackage);
if (Intent.ACTION_FACTORY_RESET.equals(intent.getAction())
&& !TextUtils.isEmpty(factoryResetPackage)) {
intent.setPackage(factoryResetPackage).setComponent(null);
context.sendBroadcastAsUser(intent, UserHandle.SYSTEM);
return;
}
final boolean shutdown = intent.getBooleanExtra("shutdown", false);
final String reason = intent.getStringExtra(Intent.EXTRA_REASON);
mWipeExternalStorage = intent.getBooleanExtra(Intent.EXTRA_WIPE_EXTERNAL_STORAGE, false);