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

Merge "Send broadcast when location mode is about to change DO NOT MERGE"

Browse Source
This commit is contained in:
Treehugger Robot
2017-11-10 15:07:04 +00:00
committed by Gerrit Code Review
parent abd78cc6b3 d35311e993
commit 1c05be48ae
1 changed files with 4 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/com/android/settings/location/LocationSettingsBase.java
View File

@@ -16,6 +16,7 @@
package com.android.settings.location; package com.android.settings.location;
import android.app.ActivityManager;
import android.content.BroadcastReceiver; import android.content.BroadcastReceiver;
import android.content.Context; import android.content.Context;
import android.content.Intent; import android.content.Intent;
@@ -28,17 +29,14 @@ import android.util.Log;
import com.android.settings.SettingsPreferenceFragment; import com.android.settings.SettingsPreferenceFragment;
import static com.android.settingslib.Utils.updateLocationMode;
/** /**
* A base class that listens to location settings change and modifies location * A base class that listens to location settings change and modifies location
* settings. * settings.
*/ */
public abstract class LocationSettingsBase extends SettingsPreferenceFragment { public abstract class LocationSettingsBase extends SettingsPreferenceFragment {
private static final String TAG = "LocationSettingsBase"; private static final String TAG = "LocationSettingsBase";
/** Broadcast intent action when the location mode is about to change. */
private static final String MODE_CHANGING_ACTION =
"com.android.settings.location.MODE_CHANGING";
private static final String CURRENT_MODE_KEY = "CURRENT_MODE";
private static final String NEW_MODE_KEY = "NEW_MODE";
private int mCurrentMode; private int mCurrentMode;
private BroadcastReceiver mReceiver; private BroadcastReceiver mReceiver;
@@ -90,15 +88,6 @@ public abstract class LocationSettingsBase extends SettingsPreferenceFragment {
return um.hasUserRestriction(UserManager.DISALLOW_SHARE_LOCATION); return um.hasUserRestriction(UserManager.DISALLOW_SHARE_LOCATION);
} }
public static boolean updateLocationMode(Context context, int oldMode, int newMode) {
Intent intent = new Intent(MODE_CHANGING_ACTION);
intent.putExtra(CURRENT_MODE_KEY, oldMode);
intent.putExtra(NEW_MODE_KEY, newMode);
context.sendBroadcast(intent, android.Manifest.permission.WRITE_SECURE_SETTINGS);
return Settings.Secure.putInt(context.getContentResolver(), Settings.Secure.LOCATION_MODE,
newMode);
}
public void setLocationMode(int mode) { public void setLocationMode(int mode) {
Context context = getActivity(); Context context = getActivity();
if (isRestricted(context)) { if (isRestricted(context)) {
@@ -115,7 +104,7 @@ public abstract class LocationSettingsBase extends SettingsPreferenceFragment {
return; return;
} }
updateLocationMode(context, mCurrentMode, mode); updateLocationMode(context, mCurrentMode, mode, ActivityManager.getCurrentUser());
refreshLocationMode(); refreshLocationMode();
} }