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

Browse Source 
am: ea0d4a65f9

Change-Id: I547138d0f45e621b583cbcc8a4ed5ab334bd4471
This commit is contained in:
Hugo Benichi
2017-05-10 01:15:30 +00:00
committed by android-build-merger
parent 5a015facd7 cfd9a290ef
commit 9e0bb312f8
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()) { ContentObserver contentObserver = new ContentObserver(this.getHandler()) {
@Override @Override
public void onChange(boolean selfChange) { public void onChange(boolean selfChange) {
if (isNsdEnabled()) { notifyEnabled(isNsdEnabled());
mNsdStateMachine.sendMessage(NsdManager.ENABLE);
} else {
mNsdStateMachine.sendMessage(NsdManager.DISABLE);
}
} }
}; };
@@ -118,11 +114,8 @@ public class NsdService extends INsdManager.Stub {
addState(mDefaultState); addState(mDefaultState);
addState(mDisabledState, mDefaultState); addState(mDisabledState, mDefaultState);
addState(mEnabledState, mDefaultState); addState(mEnabledState, mDefaultState);
if (isNsdEnabled()) { State initialState = isNsdEnabled() ? mEnabledState : mDisabledState;
setInitialState(mEnabledState); setInitialState(initialState);
} else {
setInitialState(mDisabledState);
}
setLogRecSize(25); setLogRecSize(25);
registerForNsdSetting(); registerForNsdSetting();
} }
@@ -571,25 +564,22 @@ public class NsdService extends INsdManager.Stub {
return new Messenger(mNsdStateMachine.getHandler()); return new Messenger(mNsdStateMachine.getHandler());
} }
public void setEnabled(boolean enable) { public void setEnabled(boolean isEnabled) {
mContext.enforceCallingOrSelfPermission(android.Manifest.permission.CONNECTIVITY_INTERNAL, mContext.enforceCallingOrSelfPermission(android.Manifest.permission.CONNECTIVITY_INTERNAL,
"NsdService"); "NsdService");
mNsdSettings.putEnabledStatus(enable); mNsdSettings.putEnabledStatus(isEnabled);
if (enable) { notifyEnabled(isEnabled);
mNsdStateMachine.sendMessage(NsdManager.ENABLE);
} else {
mNsdStateMachine.sendMessage(NsdManager.DISABLE);
}
} }
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); final Intent intent = new Intent(NsdManager.ACTION_NSD_STATE_CHANGED);
intent.addFlags(Intent.FLAG_RECEIVER_REGISTERED_ONLY_BEFORE_BOOT); intent.addFlags(Intent.FLAG_RECEIVER_REGISTERED_ONLY_BEFORE_BOOT);
if (enabled) { int nsdState = isEnabled ? NsdManager.NSD_STATE_ENABLED : NsdManager.NSD_STATE_DISABLED;
intent.putExtra(NsdManager.EXTRA_NSD_STATE, NsdManager.NSD_STATE_ENABLED); intent.putExtra(NsdManager.EXTRA_NSD_STATE, nsdState);
} else {
intent.putExtra(NsdManager.EXTRA_NSD_STATE, NsdManager.NSD_STATE_DISABLED);
}
mContext.sendStickyBroadcastAsUser(intent, UserHandle.ALL); mContext.sendStickyBroadcastAsUser(intent, UserHandle.ALL);
} }