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

am b39ceab7: am 65b0666d: Merge "Protect against multiple provision responses" into mnc-dr-dev

Browse Source 
* commit 'b39ceab718f0265be3c7e8bf9df1ab0917b5307b':
  Protect against multiple provision responses
This commit is contained in:
Jason Monk
2015-09-01 19:21:03 +00:00
committed by Android Git Automerger
parent 060ce6b5a7 b39ceab718
commit 2ffca0c52a
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/com/android/settings/TetherService.java
View File

@@ -69,7 +69,7 @@ public class TetherService extends Service {
@Override @Override
public void onCreate() { public void onCreate() {
super.onCreate(); super.onCreate();
if (DEBUG) Log.d(TAG, "Creating WifiProvisionService"); if (DEBUG) Log.d(TAG, "Creating TetherService");
String provisionResponse = getResources().getString( String provisionResponse = getResources().getString(
com.android.internal.R.string.config_mobile_hotspot_provision_response); com.android.internal.R.string.config_mobile_hotspot_provision_response);
registerReceiver(mReceiver, new IntentFilter(provisionResponse), registerReceiver(mReceiver, new IntentFilter(provisionResponse),
@@ -137,7 +137,7 @@ public class TetherService extends Service {
SharedPreferences prefs = getSharedPreferences(PREFS, MODE_PRIVATE); SharedPreferences prefs = getSharedPreferences(PREFS, MODE_PRIVATE);
prefs.edit().putString(KEY_TETHERS, tethersToString(mCurrentTethers)).commit(); prefs.edit().putString(KEY_TETHERS, tethersToString(mCurrentTethers)).commit();
if (DEBUG) Log.d(TAG, "Destroying WifiProvisionService"); if (DEBUG) Log.d(TAG, "Destroying TetherService");
unregisterReceiver(mReceiver); unregisterReceiver(mReceiver);
super.onDestroy(); super.onDestroy();
} }
@@ -262,6 +262,10 @@ public class TetherService extends Service {
String provisionResponse = context.getResources().getString( String provisionResponse = context.getResources().getString(
com.android.internal.R.string.config_mobile_hotspot_provision_response); com.android.internal.R.string.config_mobile_hotspot_provision_response);
if (provisionResponse.equals(intent.getAction())) { if (provisionResponse.equals(intent.getAction())) {
if (!mInProvisionCheck) {
Log.e(TAG, "Unexpected provision response " + intent);
return;
}
mInProvisionCheck = false; mInProvisionCheck = false;
int checkType = mCurrentTethers.get(mCurrentTypeIndex); int checkType = mCurrentTethers.get(mCurrentTypeIndex);
if (intent.getIntExtra(EXTRA_RESULT, RESULT_DEFAULT) == RESULT_OK) { if (intent.getIntExtra(EXTRA_RESULT, RESULT_DEFAULT) == RESULT_OK) {