Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix issue #28817455: [NYC] [BullHead] Fatal Exception in CNEService" into nyc-dev

Browse Source 
am: 0fda52b92e

* commit '0fda52b92ecc8e9eb508c6ce249705be53761277':
  Fix issue #28817455: [NYC] [BullHead] Fatal Exception in CNEService

Change-Id: I86591bd5a343ef4028ee6451b307f2a96a400486
This commit is contained in:
Dianne Hackborn
2016-05-18 00:02:13 +00:00
committed by android-build-merger
parent db314a0aa1 0fda52b92e
commit fe061f1bcb
1 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
services/core/java/com/android/server/DeviceIdleController.java
View File

@@ -325,9 +325,7 @@ public class DeviceIdleController extends SystemService
@Override public void onReceive(Context context, Intent intent) { @Override public void onReceive(Context context, Intent intent) {
switch (intent.getAction()) { switch (intent.getAction()) {
case ConnectivityManager.CONNECTIVITY_ACTION: { case ConnectivityManager.CONNECTIVITY_ACTION: {
synchronized (DeviceIdleController.this) { updateConnectivityState(intent);
updateConnectivityStateLocked(intent);
}
} break; } break;
case Intent.ACTION_BATTERY_CHANGED: { case Intent.ACTION_BATTERY_CHANGED: {
synchronized (DeviceIdleController.this) { synchronized (DeviceIdleController.this) {
@@ -1426,9 +1424,9 @@ public class DeviceIdleController extends SystemService
mLocalPowerManager.setDeviceIdleWhitelist(mPowerSaveWhitelistAllAppIdArray); mLocalPowerManager.setDeviceIdleWhitelist(mPowerSaveWhitelistAllAppIdArray);
mLocalAlarmManager.setDeviceIdleUserWhitelist(mPowerSaveWhitelistUserAppIdArray); mLocalAlarmManager.setDeviceIdleUserWhitelist(mPowerSaveWhitelistUserAppIdArray);
mDisplayManager.registerDisplayListener(mDisplayListener, null); mDisplayManager.registerDisplayListener(mDisplayListener, null);
updateConnectivityStateLocked(null);
updateDisplayLocked(); updateDisplayLocked();
} }
updateConnectivityState(null);
} }
} }
@@ -1707,9 +1705,17 @@ public class DeviceIdleController extends SystemService
} }
} }
void updateConnectivityStateLocked(Intent connIntent) { void updateConnectivityState(Intent connIntent) {
if (mConnectivityService != null) { ConnectivityService cm;
NetworkInfo ni = mConnectivityService.getActiveNetworkInfo(); synchronized (this) {
cm = mConnectivityService;
}
if (cm == null) {
return;
}
// Note: can't call out to ConnectivityService with our lock held.
NetworkInfo ni = cm.getActiveNetworkInfo();
synchronized (this) {
boolean conn; boolean conn;
if (ni == null) { if (ni == null) {
conn = false; conn = false;