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

am 91281bbd: resolved conflicts for merge of cc86bc0c to lmp-mr1-modular-dev

Browse Source 
* commit '91281bbdde1d8bcec993ff61044a5aa4897f3175':
  Prevent activities from being started during setup wizard.
This commit is contained in:
Bart Sears
2015-03-18 22:53:22 +00:00
committed by Android Git Automerger
parent b078ff16a3 91281bbdde
commit f5353e9dda
1 changed files with 23 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
policy/src/com/android/internal/policy/impl/PhoneWindowManager.java
View File

@@ -2679,7 +2679,7 @@ public class PhoneWindowManager implements WindowManagerPolicy {
voiceIntent = new Intent(RecognizerIntent.ACTION_VOICE_SEARCH_HANDS_FREE);
voiceIntent.putExtra(RecognizerIntent.EXTRA_SECURE, true);
}
mContext.startActivityAsUser(voiceIntent, UserHandle.CURRENT_OR_SELF);
startActivityAsUser(voiceIntent, UserHandle.CURRENT_OR_SELF);
}
} else if (keyCode == KeyEvent.KEYCODE_SYSRQ) {
if (down && repeatCount == 0) {
@@ -2719,7 +2719,7 @@ public class PhoneWindowManager implements WindowManagerPolicy {
Settings.System.putIntForUser(mContext.getContentResolver(),
Settings.System.SCREEN_BRIGHTNESS, brightness,
UserHandle.USER_CURRENT_OR_SELF);
mContext.startActivityAsUser(new Intent(Intent.ACTION_SHOW_BRIGHTNESS_DIALOG),
startActivityAsUser(new Intent(Intent.ACTION_SHOW_BRIGHTNESS_DIALOG),
UserHandle.CURRENT_OR_SELF);
}
return -1;
@@ -2747,7 +2747,7 @@ public class PhoneWindowManager implements WindowManagerPolicy {
if (shortcutIntent != null) {
shortcutIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
try {
mContext.startActivityAsUser(shortcutIntent, UserHandle.CURRENT);
startActivityAsUser(shortcutIntent, UserHandle.CURRENT);
} catch (ActivityNotFoundException ex) {
Slog.w(TAG, "Dropping shortcut key combination because "
+ "the activity to which it is registered was not found: "
@@ -2773,7 +2773,7 @@ public class PhoneWindowManager implements WindowManagerPolicy {
if (shortcutIntent != null) {
shortcutIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
try {
mContext.startActivityAsUser(shortcutIntent, UserHandle.CURRENT);
startActivityAsUser(shortcutIntent, UserHandle.CURRENT);
} catch (ActivityNotFoundException ex) {
Slog.w(TAG, "Dropping shortcut key combination because "
+ "the activity to which it is registered was not found: "
@@ -2791,7 +2791,7 @@ public class PhoneWindowManager implements WindowManagerPolicy {
Intent intent = Intent.makeMainSelectorActivity(Intent.ACTION_MAIN, category);
intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
try {
mContext.startActivityAsUser(intent, UserHandle.CURRENT);
startActivityAsUser(intent, UserHandle.CURRENT);
} catch (ActivityNotFoundException ex) {
Slog.w(TAG, "Dropping application launch key because "
+ "the activity to which it is registered was not found: "
@@ -2941,7 +2941,7 @@ public class PhoneWindowManager implements WindowManagerPolicy {
if (searchManager != null) {
searchManager.stopSearch();
}
mContext.startActivityAsUser(intent, UserHandle.CURRENT);
startActivityAsUser(intent, UserHandle.CURRENT);
} catch (ActivityNotFoundException e) {
Slog.w(TAG, "No activity to handle assist long press action.", e);
}
@@ -2963,13 +2963,21 @@ public class PhoneWindowManager implements WindowManagerPolicy {
| Intent.FLAG_ACTIVITY_SINGLE_TOP
| Intent.FLAG_ACTIVITY_CLEAR_TOP);
try {
mContext.startActivityAsUser(intent, UserHandle.CURRENT);
startActivityAsUser(intent, UserHandle.CURRENT);
} catch (ActivityNotFoundException e) {
Slog.w(TAG, "No activity to handle assist action.", e);
}
}
}
private void startActivityAsUser(Intent intent, UserHandle handle) {
if (isUserSetupComplete()) {
mContext.startActivityAsUser(intent, handle);
} else {
Slog.i(TAG, "Not starting activity because user setup is in progress: " + intent);
}
}
private SearchManager getSearchManager() {
if (mSearchManager == null) {
mSearchManager = (SearchManager) mContext.getSystemService(Context.SEARCH_SERVICE);
@@ -4441,7 +4449,7 @@ public class PhoneWindowManager implements WindowManagerPolicy {
intent = new Intent(MediaStore.INTENT_ACTION_STILL_IMAGE_CAMERA);
}
wakeUp(whenNanos / 1000000, mAllowTheaterModeWakeFromCameraLens);
mContext.startActivityAsUser(intent, UserHandle.CURRENT_OR_SELF);
startActivityAsUser(intent, UserHandle.CURRENT_OR_SELF);
}
mCameraLensCoverState = lensCoverState;
}
@@ -4996,7 +5004,7 @@ public class PhoneWindowManager implements WindowManagerPolicy {
Intent voiceIntent =
new Intent(RecognizerIntent.ACTION_VOICE_SEARCH_HANDS_FREE);
voiceIntent.putExtra(RecognizerIntent.EXTRA_SECURE, keyguardActive);
mContext.startActivityAsUser(voiceIntent, UserHandle.CURRENT_OR_SELF);
startActivityAsUser(voiceIntent, UserHandle.CURRENT_OR_SELF);
mBroadcastWakeLock.release();
}
@@ -5921,7 +5929,7 @@ public class PhoneWindowManager implements WindowManagerPolicy {
if (fromHomeKey) {
dock.putExtra(WindowManagerPolicy.EXTRA_FROM_HOME_KEY, fromHomeKey);
}
mContext.startActivityAsUser(dock, UserHandle.CURRENT);
startActivityAsUser(dock, UserHandle.CURRENT);
return;
} catch (ActivityNotFoundException e) {
}
@@ -5936,7 +5944,7 @@ public class PhoneWindowManager implements WindowManagerPolicy {
intent = mHomeIntent;
}
mContext.startActivityAsUser(intent, UserHandle.CURRENT);
startActivityAsUser(mHomeIntent, UserHandle.CURRENT);
}
/**
@@ -5944,6 +5952,10 @@ public class PhoneWindowManager implements WindowManagerPolicy {
* @return whether it did anything
*/
boolean goHome() {
if (!isUserSetupComplete()) {
Slog.i(TAG, "Not going home because user setup is in progress.");
return false;
}
if (false) {
// This code always brings home to the front.
try {