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

Merge "fix safeMode status in AppWidgetService"

Browse Source 
am: 78a72f0698

Change-Id: I21559690f6371102cf48132d8930343923d60011
This commit is contained in:
joonyoung.cho
2016-08-08 21:53:34 +00:00
committed by android-build-merger
parent cc6fd4549b 78a72f0698
commit cbd4ad1f7e
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
services/appwidget/java/com/android/server/appwidget/AppWidgetService.java
View File

@@ -40,7 +40,7 @@ public class AppWidgetService extends SystemService {
@Override @Override
public void onBootPhase(int phase) { public void onBootPhase(int phase) {
if (phase == PHASE_THIRD_PARTY_APPS_CAN_START) { if (phase == PHASE_ACTIVITY_MANAGER_READY) {
mImpl.setSafeMode(isSafeMode()); mImpl.setSafeMode(isSafeMode());
} }
} }

2
services/java/com/android/server/SystemServer.java
View File

@@ -1256,6 +1256,8 @@ public final class SystemServer {
} }
Trace.traceEnd(Trace.TRACE_TAG_SYSTEM_SERVER); Trace.traceEnd(Trace.TRACE_TAG_SYSTEM_SERVER);
mSystemServiceManager.setSafeMode(safeMode);
// These are needed to propagate to the runnable below. // These are needed to propagate to the runnable below.
final NetworkManagementService networkManagementF = networkManagement; final NetworkManagementService networkManagementF = networkManagement;
final NetworkStatsService networkStatsF = networkStats; final NetworkStatsService networkStatsF = networkStats;