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

Merge "NsdService: more cleanups" am: cfd9a290ef am: 49bc06d0f9 am: ea0d4a65f9

Browse Source 
am: 9e0bb312f8

Change-Id: If7fe9be600285f70b24de6ad97895555157a6a6a
This commit is contained in:
Hugo Benichi
2017-05-10 02:23:01 +00:00
committed by android-build-merger
parent c1781e6e5e 9e0bb312f8
commit cab3546780
1 changed files with 13 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
services/core/java/com/android/server/NsdService.java
View File

@@ -100,11 +100,7 @@ public class NsdService extends INsdManager.Stub {
ContentObserver contentObserver = new ContentObserver(this.getHandler()) {
@Override
public void onChange(boolean selfChange) {
if (isNsdEnabled()) {
mNsdStateMachine.sendMessage(NsdManager.ENABLE);
} else {
mNsdStateMachine.sendMessage(NsdManager.DISABLE);
}
notifyEnabled(isNsdEnabled());
}
};
@@ -118,11 +114,8 @@ public class NsdService extends INsdManager.Stub {
addState(mDefaultState);
addState(mDisabledState, mDefaultState);
addState(mEnabledState, mDefaultState);
if (isNsdEnabled()) {
setInitialState(mEnabledState);
} else {
setInitialState(mDisabledState);
}
State initialState = isNsdEnabled() ? mEnabledState : mDisabledState;
setInitialState(initialState);
setLogRecSize(25);
registerForNsdSetting();
}
@@ -571,25 +564,22 @@ public class NsdService extends INsdManager.Stub {
return new Messenger(mNsdStateMachine.getHandler());
}
public void setEnabled(boolean enable) {
public void setEnabled(boolean isEnabled) {
mContext.enforceCallingOrSelfPermission(android.Manifest.permission.CONNECTIVITY_INTERNAL,
"NsdService");
mNsdSettings.putEnabledStatus(enable);
if (enable) {
mNsdStateMachine.sendMessage(NsdManager.ENABLE);
} else {
mNsdStateMachine.sendMessage(NsdManager.DISABLE);
}
mNsdSettings.putEnabledStatus(isEnabled);
notifyEnabled(isEnabled);
}
private void sendNsdStateChangeBroadcast(boolean enabled) {
private void notifyEnabled(boolean isEnabled) {
mNsdStateMachine.sendMessage(isEnabled ? NsdManager.ENABLE : NsdManager.DISABLE);
}
private void sendNsdStateChangeBroadcast(boolean isEnabled) {
final Intent intent = new Intent(NsdManager.ACTION_NSD_STATE_CHANGED);
intent.addFlags(Intent.FLAG_RECEIVER_REGISTERED_ONLY_BEFORE_BOOT);
if (enabled) {
intent.putExtra(NsdManager.EXTRA_NSD_STATE, NsdManager.NSD_STATE_ENABLED);
} else {
intent.putExtra(NsdManager.EXTRA_NSD_STATE, NsdManager.NSD_STATE_DISABLED);
}
int nsdState = isEnabled ? NsdManager.NSD_STATE_ENABLED : NsdManager.NSD_STATE_DISABLED;
intent.putExtra(NsdManager.EXTRA_NSD_STATE, nsdState);
mContext.sendStickyBroadcastAsUser(intent, UserHandle.ALL);
}