summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorAmith Yamasani <yamasani@google.com>2013-11-06 14:54:50 -0800
committerMike Lockwood <lockwood@google.com>2013-12-09 15:14:41 -0800
commit09e9cdceceb722643e2c80c6544d44a43d7f95f0 (patch)
treeb286fb90a029e7d734b13a0b550bd1ea893a26ef /core
parentd50d41e4df482a61f840ff912aacea0e00848f41 (diff)
downloadframeworks_base-09e9cdceceb722643e2c80c6544d44a43d7f95f0.zip
frameworks_base-09e9cdceceb722643e2c80c6544d44a43d7f95f0.tar.gz
frameworks_base-09e9cdceceb722643e2c80c6544d44a43d7f95f0.tar.bz2
DO NOT MERGE : Move some system services to their own sub package.
(Cherry pick from master) As a next step they can be moved into separate directories to be built as separate modules that may or may not be included in a particular configuration. Moves AppWidgetService, BackupManagerService, ClipboardService, DevicePolicyMS, and WallpaperMS. Change-Id: Idd92871c1828bdde81d85fe99a9c87a22d53169d
Diffstat (limited to 'core')
-rw-r--r--core/java/android/app/IWallpaperManager.aidl10
-rw-r--r--core/res/AndroidManifest.xml2
2 files changed, 11 insertions, 1 deletions
diff --git a/core/java/android/app/IWallpaperManager.aidl b/core/java/android/app/IWallpaperManager.aidl
index 3efd3c0..181eb63 100644
--- a/core/java/android/app/IWallpaperManager.aidl
+++ b/core/java/android/app/IWallpaperManager.aidl
@@ -71,4 +71,14 @@ interface IWallpaperManager {
* Returns the desired minimum height for the wallpaper.
*/
int getHeightHint();
+
+ /**
+ * Returns the name of the wallpaper. Private API.
+ */
+ String getName();
+
+ /**
+ * Informs the service that wallpaper settings have been restored. Private API.
+ */
+ void settingsRestored();
}
diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml
index b198937..e546117 100644
--- a/core/res/AndroidManifest.xml
+++ b/core/res/AndroidManifest.xml
@@ -2522,7 +2522,7 @@
android:hasCode="false"
android:label="@string/android_system_label"
android:allowClearUserData="false"
- android:backupAgent="com.android.server.SystemBackupAgent"
+ android:backupAgent="com.android.server.backup.SystemBackupAgent"
android:killAfterRestore="false"
android:icon="@drawable/ic_launcher_android"
android:supportsRtl="true">