Fix developer option not being enabled.
- when screen lock is set, we will start the activity to check user's credential. Override onActivityResult() and call BuildNumberPreferenceController's method accordingly, so that we will checks the password confirm result and enable the developer options if it is success. Change-Id: Ie2df644c53430ad4eb394480348d956177804ec3 Fixes: 73102865 Test: make RunSettingsRoboTests
This commit is contained in:
@@ -21,6 +21,7 @@ import static com.android.settings.bluetooth.Utils.getLocalBtManager;
|
||||
import android.app.Activity;
|
||||
import android.app.Fragment;
|
||||
import android.content.Context;
|
||||
import android.content.Intent;
|
||||
import android.content.pm.UserInfo;
|
||||
import android.os.Bundle;
|
||||
import android.os.UserManager;
|
||||
@@ -126,6 +127,16 @@ public class MyDeviceInfoFragment extends DashboardFragment {
|
||||
return controllers;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onActivityResult(int requestCode, int resultCode, Intent data) {
|
||||
final BuildNumberPreferenceController buildNumberPreferenceController =
|
||||
getPreferenceController(BuildNumberPreferenceController.class);
|
||||
if (buildNumberPreferenceController.onActivityResult(requestCode, resultCode, data)) {
|
||||
return;
|
||||
}
|
||||
super.onActivityResult(requestCode, resultCode, data);
|
||||
}
|
||||
|
||||
private void initHeader() {
|
||||
// TODO: Migrate into its own controller.
|
||||
final LayoutPreference headerPreference =
|
||||
|
Reference in New Issue
Block a user