resolved conflicts for merge of fcf9ab5a to master

Change-Id: I69ad6e525430c5c4fc3c274b8bf6ebf653716124

diff --cc core/java/com/android/internal/os/ZygoteInit.java
Simple merge

diff --cc core/jni/AndroidRuntime.cpp
Simple merge

diff --cc services/core/java/com/android/server/am/ActivityManagerService.java
Simple merge

diff --cc services/java/com/android/server/SystemServer.java
index 21dd647,0e553b5..aafaf83
--- 1/services/java/com/android/server/SystemServer.java
--- 2/services/java/com/android/server/SystemServer.java
+++ b/services/java/com/android/server/SystemServer.java
@@@ -544,9 -568,9 +567,9 @@@ public final class SystemServer 
  
          // Bring up services needed for UI.
          if (mFactoryTestMode != FactoryTest.FACTORY_TEST_LOW_LEVEL) {
+             traceBeginAndSlog("StartInputMethodManagerService");
              try {
-                 Slog.i(TAG, "Input Method Service");
 -                imm = new InputMethodManagerService(context, wm);
 +                imm = new InputMethodManagerService(context);
                  ServiceManager.addService(Context.INPUT_METHOD_SERVICE, imm);
              } catch (Throwable e) {
                  reportWtf("starting Input Manager Service", e);
@@@ -793,9 -840,17 +839,10 @@@
                  } catch (Throwable e) {
                      reportWtf("starting Search Service", e);
                  }
+                 Trace.traceEnd(Trace.TRACE_TAG_SYSTEM_SERVER);
              }
  
 -            traceBeginAndSlog("StartDropBoxManagerService");
 -            try {
 -                ServiceManager.addService(Context.DROPBOX_SERVICE,
 -                        new DropBoxManagerService(context, new File("/data/system/dropbox")));
 -            } catch (Throwable e) {
 -                reportWtf("starting DropBoxManagerService", e);
 -            }
 -            Trace.traceEnd(Trace.TRACE_TAG_SYSTEM_SERVER);
 +            mSystemServiceManager.startService(DropBoxManagerService.class);
  
              if (!disableNonCoreServices && context.getResources().getBoolean(
                          R.bool.config_enableWallpaperService)) {
@@@ -925,9 -991,9 +983,9 @@@
                  mSystemServiceManager.startService(DreamManagerService.class);
              }
  
 -            if (!disableNonCoreServices) {
 +            if (!disableNonCoreServices && ZygoteInit.PRELOAD_RESOURCES) {
+                 traceBeginAndSlog("StartAssetAtlasService");
                  try {
-                     Slog.i(TAG, "Assets Atlas Service");
                      atlas = new AssetAtlasService(context);
                      ServiceManager.addService(AssetAtlasService.ASSET_ATLAS_SERVICE, atlas);
                  } catch (Throwable e) {
@@@ -1040,12 -1115,7 +1107,13 @@@
          w.getDefaultDisplay().getMetrics(metrics);
          context.getResources().updateConfiguration(config, metrics);
  
 +        // The system context's theme may be configuration-dependent.
 +        final Theme systemTheme = context.getTheme();
 +        if (systemTheme.getChangingConfigurations() != 0) {
 +            systemTheme.rebase();
 +        }
 +
+         Trace.traceBegin(Trace.TRACE_TAG_SYSTEM_SERVER, "MakePowerManagerServiceReady");
          try {
              // TODO: use boot phase
              mPowerManagerService.systemReady(mActivityManagerService.getAppOpsService());
@@@ -1224,6 -1322,11 +1320,11 @@@
          intent.setComponent(new ComponentName("com.android.systemui",
                      "com.android.systemui.SystemUIService"));
          //Slog.d(TAG, "Starting service: " + intent);
 -        context.startServiceAsUser(intent, UserHandle.OWNER);
 +        context.startServiceAsUser(intent, UserHandle.SYSTEM);
      }
+ 
+     private static void traceBeginAndSlog(String name) {
+         Trace.traceBegin(Trace.TRACE_TAG_SYSTEM_SERVER, name);
+         Slog.i(TAG, name);
+     }
  }