Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2d3fa418 authored by Amith Yamasani's avatar Amith Yamasani Committed by Android (Google) Code Review
Browse files

Merge "Move some system services to their own sub package."

parents 12c39dd5 30f8eb47

core/java/android/app/IWallpaperManager.aidl

+10 −0
Original line number Diff line number Diff line
@@ -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();

}

core/res/AndroidManifest.xml

+1 −1
Original line number Diff line number Diff line
@@ -2529,7 +2529,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">

services/java/com/android/server/SystemServer.java

+5 −0
Original line number Diff line number Diff line
@@ -51,7 +51,11 @@ import com.android.server.accessibility.AccessibilityManagerService; 
import com.android.server.accounts.AccountManagerService;

import com.android.server.am.ActivityManagerService;

import com.android.server.am.BatteryStatsService;

import com.android.server.appwidget.AppWidgetService;

import com.android.server.backup.BackupManagerService;

import com.android.server.clipboard.ClipboardService;

import com.android.server.content.ContentService;

import com.android.server.devicepolicy.DevicePolicyManagerService;

import com.android.server.display.DisplayManagerService;

import com.android.server.dreams.DreamManagerService;

import com.android.server.input.InputManagerService;
@@ -67,6 +71,7 @@ import com.android.server.power.ShutdownThread; 
import com.android.server.print.PrintManagerService;

import com.android.server.search.SearchManagerService;

import com.android.server.usb.UsbService;

import com.android.server.wallpaper.WallpaperManagerService;

import com.android.server.wifi.WifiService;

import com.android.server.wm.WindowManagerService;

services/java/com/android/server/AppWidgetService.java→services/java/com/android/server/appwidget/AppWidgetService.java

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

 */



package com.android.server;

package com.android.server.appwidget;



import android.app.ActivityManager;

import android.appwidget.AppWidgetProviderInfo;
@@ -48,7 +48,7 @@ import java.util.Locale; 
/**

 * Redirects calls to this service to the instance of the service for the appropriate user.

 */

class AppWidgetService extends IAppWidgetService.Stub

public class AppWidgetService extends IAppWidgetService.Stub

{

    private static final String TAG = "AppWidgetService";
@@ -60,7 +60,7 @@ class AppWidgetService extends IAppWidgetService.Stub 


    private final SparseArray<AppWidgetServiceImpl> mAppWidgetServices;



    AppWidgetService(Context context) {

    public AppWidgetService(Context context) {

        mContext = context;



        mSaveStateHandler = BackgroundThread.getHandler();

services/java/com/android/server/AppWidgetServiceImpl.java→services/java/com/android/server/appwidget/AppWidgetServiceImpl.java

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

 */



package com.android.server;

package com.android.server.appwidget;



import android.app.AlarmManager;

import android.app.AppGlobals;