diff options
| -rw-r--r-- | AndroidManifest.xml | 3 | ||||
| -rw-r--r-- | src/com/cyanogenmod/setupwizard/ui/SetupWizardActivity.java | 10 |
2 files changed, 6 insertions, 7 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index a982a30..e8f2b0c 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -19,8 +19,6 @@ android:versionCode="3" android:sharedUserId="android.uid.system"> - <original-package android:name="com.cyanogenmod.account" /> - <uses-permission android:name="android.permission.CHANGE_CONFIGURATION" /> <uses-permission android:name="android.permission.STATUS_BAR" /> <uses-permission android:name="android.permission.WRITE_SETTINGS" /> @@ -46,6 +44,7 @@ <uses-permission android:name="android.permission.HARDWARE_ABSTRACTION_ACCESS" /> <uses-permission android:name="android.permission.BACKUP" /> <uses-permission android:name="org.whispersystems.whisperpush.permissions.REGISTER" /> + <uses-permission android:name="cyanogenmod.permission.FINISH_SETUP" /> <permission android:name="cyanogenmod.permission.PROTECTED_APP" diff --git a/src/com/cyanogenmod/setupwizard/ui/SetupWizardActivity.java b/src/com/cyanogenmod/setupwizard/ui/SetupWizardActivity.java index bded6ff..44855a8 100644 --- a/src/com/cyanogenmod/setupwizard/ui/SetupWizardActivity.java +++ b/src/com/cyanogenmod/setupwizard/ui/SetupWizardActivity.java @@ -111,14 +111,14 @@ public class SetupWizardActivity extends Activity implements SetupDataCallbacks try { if (Settings.Secure.getInt(getContentResolver(), Settings.Secure.USER_SETUP_COMPLETE) == 1) { - finishSetup(); + finishSetup(false); } } catch (Settings.SettingNotFoundException e) { // Continue with setup } mIsGuestUser = SetupWizardUtils.isGuestUser(this); if (mIsGuestUser) { - finishSetup(); + finishSetup(false); } registerReceiver(mSetupData, mSetupData.getIntentFilter()); } @@ -289,7 +289,7 @@ public class SetupWizardActivity extends Activity implements SetupDataCallbacks mHandler.post(new Runnable() { @Override public void run() { - finishSetup(); + finishSetup(true); } }); } @@ -303,9 +303,9 @@ public class SetupWizardActivity extends Activity implements SetupDataCallbacks anim.start(); } - private void finishSetup() { + private void finishSetup(boolean broadcastFinish) { SetupWizardApp setupWizardApp = (SetupWizardApp)getApplication(); - if (!mIsGuestUser) { + if (broadcastFinish && !mIsGuestUser) { setupWizardApp.sendBroadcastAsUser(new Intent(SetupWizardApp.ACTION_FINISHED), UserHandle.getCallingUserHandle()); } |