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

am 2d53e1a5: Merge "Formatting fix"

Browse Source 
* commit '2d53e1a5d27e27e7d83474c9cd9e3f5c4ed49a91':
  Formatting fix
This commit is contained in:
Steven Ross
2011-10-04 13:06:36 -07:00
committed by Android Git Automerger
parent 649b34b0cf 2d53e1a5d2
commit 542d00c0ba
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/com/android/settings/ChooseLockGeneric.java
View File

@@ -325,8 +325,7 @@ public class ChooseLockGeneric extends PreferenceActivity {
if(isFallback) { if(isFallback) {
startActivityForResult(intent, FALLBACK_REQUEST); startActivityForResult(intent, FALLBACK_REQUEST);
return; return;
} } else {
else {
intent.addFlags(Intent.FLAG_ACTIVITY_FORWARD_RESULT); intent.addFlags(Intent.FLAG_ACTIVITY_FORWARD_RESULT);
startActivity(intent); startActivity(intent);
} }
@@ -343,8 +342,7 @@ public class ChooseLockGeneric extends PreferenceActivity {
if(isFallback) { if(isFallback) {
startActivityForResult(intent, FALLBACK_REQUEST); startActivityForResult(intent, FALLBACK_REQUEST);
return; return;
} } else {
else {
intent.addFlags(Intent.FLAG_ACTIVITY_FORWARD_RESULT); intent.addFlags(Intent.FLAG_ACTIVITY_FORWARD_RESULT);
startActivity(intent); startActivity(intent);
} }