Compare commits

..

2 commits

View file

@ -18,6 +18,7 @@ import android.os.RemoteException;
import android.os.StrictMode; import android.os.StrictMode;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.ViewGroup; import android.view.ViewGroup;
import android.view.WindowManager;
import android.widget.ProgressBar; import android.widget.ProgressBar;
import android.widget.Toast; import android.widget.Toast;
@ -91,6 +92,8 @@ public class DummyActivity extends Activity {
private static final int REQUEST_PERMISSION_EXTERNAL_STORAGE= 2; private static final int REQUEST_PERMISSION_EXTERNAL_STORAGE= 2;
private static final int REQUEST_PERMISSION_POST_NOTIFICATIONS = 3; private static final int REQUEST_PERMISSION_POST_NOTIFICATIONS = 3;
private static boolean sHasRequestedPermission = false;
// A state variable to record the last time DummyActivity was informed that someone // A state variable to record the last time DummyActivity was informed that someone
// in the same process needs to call an action without signature // in the same process needs to call an action without signature
// Since they must be in the same process as DummyActivity, it will be totally fine // Since they must be in the same process as DummyActivity, it will be totally fine
@ -133,11 +136,16 @@ public class DummyActivity extends Activity {
Utility.enforceUserRestrictions(this); Utility.enforceUserRestrictions(this);
SettingsManager.getInstance().applyAll(); SettingsManager.getInstance().applyAll();
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) { synchronized (DummyActivity.class) {
// Do not show permission dialog during finalization -- it will conflict with the provisioning UI
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU && !sHasRequestedPermission
&& !FINALIZE_PROVISION.equals(getIntent().getAction())) {
// Avoid requesting permission multiple times in one session
// This also prevents multiple instances of DummyActivity from being blocked on each other
sHasRequestedPermission = true;
// We pretty much only send notifications to keep the process inside work profile alive // We pretty much only send notifications to keep the process inside work profile alive
// as such, only request the notification permission from inside the profile // as such, only request the notification permission from inside the profile
// This will ideally be shown and done when finalizing the profile (since it will go // This will ideally be shown and done when the user sees the app list UI for the first time
// through this activity)
if (ContextCompat.checkSelfPermission(this, Manifest.permission.POST_NOTIFICATIONS) if (ContextCompat.checkSelfPermission(this, Manifest.permission.POST_NOTIFICATIONS)
!= PackageManager.PERMISSION_GRANTED) { != PackageManager.PERMISSION_GRANTED) {
requestPermissions(new String[]{Manifest.permission.POST_NOTIFICATIONS}, REQUEST_PERMISSION_POST_NOTIFICATIONS); requestPermissions(new String[]{Manifest.permission.POST_NOTIFICATIONS}, REQUEST_PERMISSION_POST_NOTIFICATIONS);
@ -146,6 +154,7 @@ public class DummyActivity extends Activity {
} }
} }
} }
}
init(); init();
} }
@ -248,6 +257,11 @@ public class DummyActivity extends Activity {
private void actionFinalizeProvision() { private void actionFinalizeProvision() {
if (mIsProfileOwner) { if (mIsProfileOwner) {
// Only notify the main profile on pre-Oreo
// After Oreo, since we use the activity-based finalization flow,
// the setup wizard will wait until we finish finalization before returning
// (Note: the actual finalization is done by common code in onCreate)
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.O) {
// This is the action used by DeviceAdminReceiver to finalize the setup // This is the action used by DeviceAdminReceiver to finalize the setup
// The work has been finished in onCreate(), now we just have to // The work has been finished in onCreate(), now we just have to
// inform the main profile about this // inform the main profile about this
@ -255,6 +269,7 @@ public class DummyActivity extends Activity {
// We don't need signature for this intent // We don't need signature for this intent
Utility.transferIntentToProfileUnsigned(this, intent); Utility.transferIntentToProfileUnsigned(this, intent);
startActivity(intent); startActivity(intent);
}
finish(); finish();
} else { } else {
// Set the flag telling MainActivity that we have now finished provisioning // Set the flag telling MainActivity that we have now finished provisioning