Merge "Move LoadAverageService to the SystemUI apk." (b3a26f4d) · Commits · e / os / android_frameworks_base

services/java/com/android/server/ProcessStats.java→core/java/com/android/internal/os/ProcessStats.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -14,7 +14,7 @@
		* limitations under the License.
		*/

		package com.android.server;
		package com.android.internal.os;

		import static android.os.Process.*;

		@@ -182,7 +182,7 @@ public class ProcessStats {

		public String baseName;
		public String name;
		int nameWidth;
		public int nameWidth;

		public long base_uptime;
		public long rel_uptime;

core/res/AndroidManifest.xml

+0 −3

Original line number	Diff line number	Diff line
		@@ -1489,9 +1489,6 @@
		android:excludeFromRecents="true">
		</activity>

		<service android:name="com.android.server.LoadAverageService"
		android:exported="true" />

		<service android:name="com.android.internal.service.wallpaper.ImageWallpaper"
		android:permission="android.permission.BIND_WALLPAPER">
		</service>

packages/SystemUI/AndroidManifest.xml

+9 −0

Original line number	Diff line number	Diff line
		@@ -30,6 +30,15 @@
		<service android:name=".screenshot.TakeScreenshotService"
		android:exported="false" />

		<service android:name=".LoadAverageService"
		android:exported="true" />

		<receiver android:name=".BootReceiver" >
		<intent-filter>
		<action android:name="android.intent.action.BOOT_COMPLETED" />
		</intent-filter>
		</receiver>

		<activity android:name=".usb.UsbStorageActivity"
		android:excludeFromRecents="true">
		</activity>

packages/SystemUI/src/com/android/systemui/BootReceiver.java

0 → 100644

+46 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2011 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		package com.android.systemui;

		import android.content.BroadcastReceiver;
		import android.content.ContentResolver;
		import android.content.Context;
		import android.content.Intent;
		import android.provider.Settings;
		import android.util.Slog;

		/**
		* Performs a number of miscellaneous, non-system-critical actions
		* after the system has finished booting.
		*/
		public class BootReceiver extends BroadcastReceiver {
		private static final String TAG = "SystemUIBootReceiver";

		@Override
		public void onReceive(final Context context, Intent intent) {
		try {
		// Start the load average overlay, if activated
		ContentResolver res = context.getContentResolver();
		if (Settings.System.getInt(res, Settings.System.SHOW_PROCESSES, 0) != 0) {
		Intent loadavg = new Intent(context, com.android.systemui.LoadAverageService.class);
		context.startService(loadavg);
		}
		} catch (Exception e) {
		Slog.e(TAG, "Can't start load average service", e);
		}
		}
		}

services/java/com/android/server/LoadAverageService.java→packages/SystemUI/src/com/android/systemui/LoadAverageService.java

+3 −1

Original line number	Diff line number	Diff line
		@@ -14,7 +14,9 @@
		* limitations under the License.
		*/

		package com.android.server;
		package com.android.systemui;

		import com.android.internal.os.ProcessStats;

		import android.app.Service;
		import android.content.Context;