LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

am 3a8af8ef: Merge "Migrate more Secure settings to Global." into jb-mr1-dev

Browse Source 
* commit '3a8af8efff93ca8ee80fc8c7841e7bee9a8b7786':
  Migrate more Secure settings to Global.
This commit is contained in:
Jeff Sharkey
2012-09-27 19:33:38 -07:00
committed by Android Git Automerger
parent e7e41f555c c783695df2
commit 233698fe0e
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
services/java/com/android/server/NsdService.java
View File

@@ -131,7 +131,7 @@ public class NsdService extends INsdManager.Stub {
}; };
mContext.getContentResolver().registerContentObserver( mContext.getContentResolver().registerContentObserver(
Settings.Secure.getUriFor(Settings.Secure.NSD_ON), Settings.Global.getUriFor(Settings.Global.NSD_ON),
false, contentObserver); false, contentObserver);
} }
@@ -433,7 +433,7 @@ public class NsdService extends INsdManager.Stub {
public void setEnabled(boolean enable) { public void setEnabled(boolean enable) {
mContext.enforceCallingOrSelfPermission(android.Manifest.permission.CONNECTIVITY_INTERNAL, mContext.enforceCallingOrSelfPermission(android.Manifest.permission.CONNECTIVITY_INTERNAL,
"NsdService"); "NsdService");
Settings.Secure.putInt(mContentResolver, Settings.Secure.NSD_ON, enable ? 1 : 0); Settings.Global.putInt(mContentResolver, Settings.Global.NSD_ON, enable ? 1 : 0);
if (enable) { if (enable) {
mNsdStateMachine.sendMessage(NsdManager.ENABLE); mNsdStateMachine.sendMessage(NsdManager.ENABLE);
} else { } else {
@@ -453,7 +453,7 @@ public class NsdService extends INsdManager.Stub {
} }
private boolean isNsdEnabled() { private boolean isNsdEnabled() {
boolean ret = Settings.Secure.getInt(mContentResolver, Settings.Secure.NSD_ON, 1) == 1; boolean ret = Settings.Global.getInt(mContentResolver, Settings.Global.NSD_ON, 1) == 1;
if (DBG) Slog.d(TAG, "Network service discovery enabled " + ret); if (DBG) Slog.d(TAG, "Network service discovery enabled " + ret);
return ret; return ret;
} }

6
services/java/com/android/server/net/NetworkStatsService.java
View File

@@ -104,7 +104,7 @@ import android.os.RemoteException;
import android.os.SystemClock; import android.os.SystemClock;
import android.os.UserHandle; import android.os.UserHandle;
import android.provider.Settings; import android.provider.Settings;
import android.provider.Settings.Secure; import android.provider.Settings.Global;
import android.telephony.PhoneStateListener; import android.telephony.PhoneStateListener;
import android.telephony.TelephonyManager; import android.telephony.TelephonyManager;
import android.util.EventLog; import android.util.EventLog;
@@ -696,7 +696,7 @@ public class NetworkStatsService extends INetworkStatsService.Stub {
/** /**
* Update {@link NetworkStatsRecorder} and {@link #mGlobalAlertBytes} to * Update {@link NetworkStatsRecorder} and {@link #mGlobalAlertBytes} to
* reflect current {@link #mPersistThreshold} value. Always defers to * reflect current {@link #mPersistThreshold} value. Always defers to
* {@link Secure} values when defined. * {@link Global} values when defined.
*/ */
private void updatePersistThresholds() { private void updatePersistThresholds() {
mDevRecorder.setPersistThreshold(mSettings.getDevPersistBytes(mPersistThreshold)); mDevRecorder.setPersistThreshold(mSettings.getDevPersistBytes(mPersistThreshold));
@@ -1263,7 +1263,7 @@ public class NetworkStatsService extends INetworkStatsService.Stub {
/** /**
* Default external settings that read from * Default external settings that read from
* {@link android.provider.Settings.Secure}. * {@link android.provider.Settings.Global}.
*/ */
private static class DefaultNetworkStatsSettings implements NetworkStatsSettings { private static class DefaultNetworkStatsSettings implements NetworkStatsSettings {
private final ContentResolver mResolver; private final ContentResolver mResolver;