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

Commit 4f8ecd80 authored by Jeff Brown's avatar Jeff Brown
Browse files

Move power manager to a new package. 

Change-Id: I5f5a6435e64354b7d6535e8e9a63934ba7a3f448
parent 099adfba

services/java/com/android/server/BatteryService.java

+5 −5
Original line number Original line Diff line number Diff line
@@ -68,7 +68,7 @@ import java.util.Arrays; 
 * a degree Centigrade</p>

 * a degree Centigrade</p>

 * <p>&quot;technology&quot; - String, the type of battery installed, e.g. "Li-ion"</p>

 * <p>&quot;technology&quot; - String, the type of battery installed, e.g. "Li-ion"</p>

 */

 */

class BatteryService extends Binder {

public class BatteryService extends Binder {

    private static final String TAG = BatteryService.class.getSimpleName();

    private static final String TAG = BatteryService.class.getSimpleName();





    private static final boolean LOCAL_LOGV = false;

    private static final boolean LOCAL_LOGV = false;
@@ -148,12 +148,12 @@ class BatteryService extends Binder { 
        update();

        update();

    }

    }





    final boolean isPowered() {

    public final boolean isPowered() {

        // assume we are powered if battery state is unknown so the "stay on while plugged in" option will work.

        // assume we are powered if battery state is unknown so the "stay on while plugged in" option will work.

        return (mAcOnline || mUsbOnline || mBatteryStatus == BatteryManager.BATTERY_STATUS_UNKNOWN);

        return (mAcOnline || mUsbOnline || mBatteryStatus == BatteryManager.BATTERY_STATUS_UNKNOWN);

    }

    }





    final boolean isPowered(int plugTypeSet) {

    public final boolean isPowered(int plugTypeSet) {

        // assume we are powered if battery state is unknown so

        // assume we are powered if battery state is unknown so

        // the "stay on while plugged in" option will work.

        // the "stay on while plugged in" option will work.

        if (mBatteryStatus == BatteryManager.BATTERY_STATUS_UNKNOWN) {

        if (mBatteryStatus == BatteryManager.BATTERY_STATUS_UNKNOWN) {
@@ -172,7 +172,7 @@ class BatteryService extends Binder { 
        return (plugTypeSet & plugTypeBit) != 0;

        return (plugTypeSet & plugTypeBit) != 0;

    }

    }





    final int getPlugType() {

    public final int getPlugType() {

        return mPlugType;

        return mPlugType;

    }

    }
@@ -195,7 +195,7 @@ class BatteryService extends Binder { 
    };

    };





    // returns battery level as a percentage

    // returns battery level as a percentage

    final int getBatteryLevel() {

    public final int getBatteryLevel() {

        return mBatteryLevel;

        return mBatteryLevel;

    }

    }

services/java/com/android/server/DockObserver.java

+2 −0
Original line number Original line Diff line number Diff line
@@ -16,6 +16,8 @@ 




package com.android.server;

package com.android.server;





import com.android.server.power.PowerManagerService;



import android.bluetooth.BluetoothAdapter;

import android.bluetooth.BluetoothAdapter;

import android.bluetooth.BluetoothDevice;

import android.bluetooth.BluetoothDevice;

import android.content.ContentResolver;

import android.content.ContentResolver;

services/java/com/android/server/LightsService.java

+15 −15
Original line number Original line Diff line number Diff line
@@ -31,29 +31,29 @@ public class LightsService { 
    private static final String TAG = "LightsService";

    private static final String TAG = "LightsService";

    private static final boolean DEBUG = false;

    private static final boolean DEBUG = false;





    static final int LIGHT_ID_BACKLIGHT = 0;

    public static final int LIGHT_ID_BACKLIGHT = 0;

    static final int LIGHT_ID_KEYBOARD = 1;

    public static final int LIGHT_ID_KEYBOARD = 1;

    static final int LIGHT_ID_BUTTONS = 2;

    public static final int LIGHT_ID_BUTTONS = 2;

    static final int LIGHT_ID_BATTERY = 3;

    public static final int LIGHT_ID_BATTERY = 3;

    static final int LIGHT_ID_NOTIFICATIONS = 4;

    public static final int LIGHT_ID_NOTIFICATIONS = 4;

    static final int LIGHT_ID_ATTENTION = 5;

    public static final int LIGHT_ID_ATTENTION = 5;

    static final int LIGHT_ID_BLUETOOTH = 6;

    public static final int LIGHT_ID_BLUETOOTH = 6;

    static final int LIGHT_ID_WIFI = 7;

    public static final int LIGHT_ID_WIFI = 7;

    static final int LIGHT_ID_COUNT = 8;

    public static final int LIGHT_ID_COUNT = 8;





    static final int LIGHT_FLASH_NONE = 0;

    public static final int LIGHT_FLASH_NONE = 0;

    static final int LIGHT_FLASH_TIMED = 1;

    public static final int LIGHT_FLASH_TIMED = 1;

    static final int LIGHT_FLASH_HARDWARE = 2;

    public static final int LIGHT_FLASH_HARDWARE = 2;





    /**

    /**

     * Light brightness is managed by a user setting.

     * Light brightness is managed by a user setting.

     */

     */

    static final int BRIGHTNESS_MODE_USER = 0;

    public static final int BRIGHTNESS_MODE_USER = 0;





    /**

    /**

     * Light brightness is managed by a light sensor.

     * Light brightness is managed by a light sensor.

     */

     */

    static final int BRIGHTNESS_MODE_SENSOR = 1;

    public static final int BRIGHTNESS_MODE_SENSOR = 1;





    private final Light mLights[] = new Light[LIGHT_ID_COUNT];

    private final Light mLights[] = new Light[LIGHT_ID_COUNT];

services/java/com/android/server/ShutdownActivity.java

+1 −2
Original line number Original line Diff line number Diff line
@@ -17,13 +17,12 @@ 
package com.android.server;

package com.android.server;





import android.app.Activity;

import android.app.Activity;

import android.content.BroadcastReceiver;

import android.content.Intent;

import android.content.Intent;

import android.os.Bundle;

import android.os.Bundle;

import android.os.Handler;

import android.os.Handler;

import android.util.Slog;

import android.util.Slog;





import com.android.server.pm.ShutdownThread;

import com.android.server.power.ShutdownThread;





public class ShutdownActivity extends Activity {

public class ShutdownActivity extends Activity {

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

+2 −1
Original line number Original line Diff line number Diff line
@@ -55,7 +55,8 @@ import com.android.server.input.InputManagerService; 
import com.android.server.net.NetworkPolicyManagerService;

import com.android.server.net.NetworkPolicyManagerService;

import com.android.server.net.NetworkStatsService;

import com.android.server.net.NetworkStatsService;

import com.android.server.pm.PackageManagerService;

import com.android.server.pm.PackageManagerService;

import com.android.server.pm.ShutdownThread;

import com.android.server.power.PowerManagerService;

import com.android.server.power.ShutdownThread;

import com.android.server.usb.UsbService;

import com.android.server.usb.UsbService;

import com.android.server.wm.WindowManagerService;

import com.android.server.wm.WindowManagerService;