Merge "Move SystemUI out of system UID." (875f0643) · Commits · e / os / android_frameworks_base

core/java/android/service/wallpaper/WallpaperService.java

+8 −2

Original line number	Diff line number	Diff line
		@@ -140,6 +140,7 @@ public abstract class WallpaperService extends Service {
		boolean mIsCreating;
		boolean mDrawingAllowed;
		boolean mOffsetsChanged;
		boolean mFixedSizeAllowed;
		int mWidth;
		int mHeight;
		int mFormat;
		@@ -211,7 +212,7 @@ public abstract class WallpaperService extends Service {

		@Override
		public void setFixedSize(int width, int height) {
		if (Process.myUid() != Process.SYSTEM_UID) {
		if (!mFixedSizeAllowed) {
		// Regular apps can't do this. It can only work for
		// certain designs of window animations, so you can't
		// rely on it.
		@@ -386,6 +387,11 @@ public abstract class WallpaperService extends Service {
		}
		}

		/** {@hide} */
		public void setFixedSizeAllowed(boolean allowed) {
		mFixedSizeAllowed = allowed;
		}

		/**
		* Called once to initialize the engine. After returning, the
		* engine's surface will be created by the framework.

core/res/AndroidManifest.xml

+8 −0

Original line number	Diff line number	Diff line
		@@ -737,6 +737,14 @@
		android:label="@string/permlab_removeTasks"
		android:description="@string/permdesc_removeTasks" />

		<!-- Allows an application to start any activity, regardless of permission
		protection or exported state. @hide -->
		<permission android:name="android.permission.START_ANY_ACTIVITY"
		android:permissionGroup="android.permission-group.SYSTEM_TOOLS"
		android:protectionLevel="signature"
		android:label="@string/permlab_startAnyActivity"
		android:description="@string/permdesc_startAnyActivity" />

		<!-- @hide Change the screen compatibility mode of applications -->
		<permission android:name="android.permission.SET_SCREEN_COMPATIBILITY"
		android:permissionGroup="android.permission-group.SYSTEM_TOOLS"

core/res/res/values/strings.xml

+5 −0

Original line number	Diff line number	Diff line
		@@ -538,6 +538,11 @@
		tasks and kill their apps. Malicious apps may disrupt
		the behavior of other apps.</string>

		<!-- Title of an application permission, allowing an application to start any activity, regardless of permission protection or exported state. -->
		<string name="permlab_startAnyActivity">start any activity</string>
		<!-- Description of an application permission, allowing an application to start any activity, regardless of permission protection or exported state. -->
		<string name="permdesc_startAnyActivity">Allows the app to start any activity, regardless of permission protection or exported state.</string>

		<!-- Title of an application permission, allowing control of app screen compatibility mode -->
		<string name="permlab_setScreenCompatibility">set screen compatibility</string>
		<!-- Description of an application permission, allowing control of app screen compatibility mode -->

packages/SystemUI/AndroidManifest.xml

+34 −5

Original line number	Diff line number	Diff line
		<manifest xmlns:android="http://schemas.android.com/apk/res/android"
		package="com.android.systemui"
		coreApp="true"
		android:sharedUserId="android.uid.system"
		android:process="system"
		>
		coreApp="true">

		<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />

		<uses-permission android:name="android.permission.INJECT_EVENTS" />
		<uses-permission android:name="android.permission.WRITE_SETTINGS" />

		<uses-permission android:name="android.permission.STATUS_BAR_SERVICE" />
		<uses-permission android:name="android.permission.STATUS_BAR" />
		<uses-permission android:name="android.permission.EXPAND_STATUS_BAR" />

		<!-- Networking and telephony -->
		<uses-permission android:name="android.permission.BLUETOOTH" />
		<uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
		<uses-permission android:name="android.permission.GET_TASKS" />
		<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
		<uses-permission android:name="android.permission.READ_PHONE_STATE" />
		<uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
		<uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />

		<!-- Physical hardware -->
		<uses-permission android:name="android.permission.MANAGE_USB" />
		<uses-permission android:name="android.permission.DEVICE_POWER" />
		<uses-permission android:name="android.permission.MOUNT_UNMOUNT_FILESYSTEMS" />
		<uses-permission android:name="android.permission.UPDATE_DEVICE_STATS" />

		<!-- ActivityManager -->
		<uses-permission android:name="android.permission.GET_TASKS" />
		<uses-permission android:name="android.permission.REORDER_TASKS" />
		<uses-permission android:name="android.permission.REMOVE_TASKS" />
		<uses-permission android:name="android.permission.STOP_APP_SWITCHES" />
		<uses-permission android:name="android.permission.SET_SCREEN_COMPATIBILITY" />
		<uses-permission android:name="android.permission.START_ANY_ACTIVITY" />

		<!-- WindowManager -->
		<uses-permission android:name="android.permission.INTERNAL_SYSTEM_WINDOW" />
		<uses-permission android:name="android.permission.READ_FRAME_BUFFER" />
		<uses-permission android:name="android.permission.MANAGE_APP_TOKENS" />
		<uses-permission android:name="android.permission.SET_ORIENTATION" />
		<uses-permission android:name="android.permission.DISABLE_KEYGUARD" />

		<application
		android:persistent="true"

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

+5 −0

Original line number	Diff line number	Diff line
		@@ -155,6 +155,11 @@ public class ImageWallpaper extends WallpaperService {
		}
		}

		public DrawableEngine() {
		super();
		setFixedSizeAllowed(true);
		}

		@Override
		public void onCreate(SurfaceHolder surfaceHolder) {
		if (DEBUG) {