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

Commit 7304c343 authored by Jeff Brown's avatar Jeff Brown
Browse files

Move power HAL interactions to PowerManagerService. 

This refactoring sets the stage for a follow-on change that
will make use additional functions of the power HAL.

Moved functionality from android.os.Power into PowerManagerService.
None of these functions make sense being called outside of the
system server.  Moving them to the PowerManagerService makes it
easier to ensure that the power HAL is initialized exactly once.

Similarly, moved ShutdownThread out of the policy package and into
the services package where it can tie into the PowerManagerService
as needed.

Bug: 6435382
Change-Id: I958241bb124fb4410d96f5d5eb00ed68d60b29e5
parent 888da152

core/java/android/os/Power.java

deleted100644 → 0
+0 −109
Original line number Original line Diff line number Diff line 
/*

 * Copyright (C) 2007 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 android.os;



import java.io.IOException;

import android.os.ServiceManager;



/**

 * Class that provides access to some of the power management functions.

 *

 * {@hide}

 */

public class Power

{

    // can't instantiate this class

    private Power()

    {

    }



    /**

     * Wake lock that ensures that the CPU is running.  The screen might

     * not be on.

     */

    public static final int PARTIAL_WAKE_LOCK = 1;



    /**

     * Wake lock that ensures that the screen is on.

     */

    public static final int FULL_WAKE_LOCK = 2;



    public static native void acquireWakeLock(int lock, String id);

    public static native void releaseWakeLock(String id);



    /**

     * Brightness value for fully off

     */

    public static final int BRIGHTNESS_OFF = 0;



    /**

     * Brightness value for dim backlight

     */

    public static final int BRIGHTNESS_DIM = 20;



    /**

     * Brightness value for fully on

     */

    public static final int BRIGHTNESS_ON = 255;



    /**

     * Brightness value to use when battery is low

     */

    public static final int BRIGHTNESS_LOW_BATTERY = 10;



    /**

     * Threshold for BRIGHTNESS_LOW_BATTERY (percentage)

     * Screen will stay dim if battery level is <= LOW_BATTERY_THRESHOLD

     */

    public static final int LOW_BATTERY_THRESHOLD = 10;



    /**

     * Turn the screen on or off

     *

     * @param on Whether you want the screen on or off

     */

    public static native int setScreenState(boolean on);



    public static native int setLastUserActivityTimeout(long ms);



    /**

     * Low-level function turn the device off immediately, without trying

     * to be clean.  Most people should use

     * {@link android.internal.app.ShutdownThread} for a clean shutdown.

     *

     * @deprecated

     * @hide

     */

    @Deprecated

    public static native void shutdown();



    /**

     * Reboot the device.

     * @param reason code to pass to the kernel (e.g. "recovery"), or null.

     *

     * @throws IOException if reboot fails for some reason (eg, lack of

     *         permission)

     */

    public static void reboot(String reason) throws IOException

    {

        rebootNative(reason);

    }



    private static native void rebootNative(String reason) throws IOException ;



    public static native int powerInitNative();

}

core/java/android/os/PowerManager.java

+25 −1
Original line number Original line Diff line number Diff line
@@ -198,6 +198,30 @@ public class PowerManager 
     */

     */

    public static final int ON_AFTER_RELEASE = 0x20000000;

    public static final int ON_AFTER_RELEASE = 0x20000000;





    /**

     * Brightness value to use when battery is low.

     * @hide

     */

    public static final int BRIGHTNESS_LOW_BATTERY = 10;



    /**

     * Brightness value for fully on.

     * @hide

     */

    public static final int BRIGHTNESS_ON = 255;



    /**

     * Brightness value for dim backlight.

     * @hide

     */

    public static final int BRIGHTNESS_DIM = 20;



    /**

     * Brightness value for fully off.

     * @hide

     */

    public static final int BRIGHTNESS_OFF = 0;



    /**

    /**

     * Class lets you say that you need to have the device on.

     * Class lets you say that you need to have the device on.

     * <p>

     * <p>

core/java/android/view/WindowManagerPolicy.java

+3 −0
Original line number Original line Diff line number Diff line
@@ -397,6 +397,9 @@ public interface WindowManagerPolicy { 
         * Creates an input channel that will receive all input from the input dispatcher.

         * Creates an input channel that will receive all input from the input dispatcher.

         */

         */

        public InputChannel monitorInput(String name);

        public InputChannel monitorInput(String name);



        public void shutdown();

        public void rebootSafeMode();

    }

    }





    /**

    /**

core/jni/Android.mk

+1 −3
Original line number Original line Diff line number Diff line
@@ -66,7 +66,6 @@ LOCAL_SRC_FILES:= \ 
	android_os_MessageQueue.cpp \

	android_os_MessageQueue.cpp \

	android_os_ParcelFileDescriptor.cpp \

	android_os_ParcelFileDescriptor.cpp \

	android_os_Parcel.cpp \

	android_os_Parcel.cpp \

	android_os_Power.cpp \

	android_os_StatFs.cpp \

	android_os_StatFs.cpp \

	android_os_SystemClock.cpp \

	android_os_SystemClock.cpp \

	android_os_SystemProperties.cpp \

	android_os_SystemProperties.cpp \
@@ -217,8 +216,7 @@ LOCAL_SHARED_LIBRARIES := \ 
	libjpeg \

	libjpeg \

	libusbhost \

	libusbhost \

	libharfbuzz \

	libharfbuzz \

	libz \

	libz

	libsuspend \





ifeq ($(USE_OPENGL_RENDERER),true)

ifeq ($(USE_OPENGL_RENDERER),true)

	LOCAL_SHARED_LIBRARIES += libhwui

	LOCAL_SHARED_LIBRARIES += libhwui

core/jni/AndroidRuntime.cpp

+0 −2
Original line number Original line Diff line number Diff line
@@ -133,7 +133,6 @@ extern int register_android_os_Debug(JNIEnv* env); 
extern int register_android_os_MessageQueue(JNIEnv* env);

extern int register_android_os_MessageQueue(JNIEnv* env);

extern int register_android_os_Parcel(JNIEnv* env);

extern int register_android_os_Parcel(JNIEnv* env);

extern int register_android_os_ParcelFileDescriptor(JNIEnv *env);

extern int register_android_os_ParcelFileDescriptor(JNIEnv *env);

extern int register_android_os_Power(JNIEnv *env);

extern int register_android_os_StatFs(JNIEnv *env);

extern int register_android_os_StatFs(JNIEnv *env);

extern int register_android_os_SystemProperties(JNIEnv *env);

extern int register_android_os_SystemProperties(JNIEnv *env);

extern int register_android_os_SystemClock(JNIEnv* env);

extern int register_android_os_SystemClock(JNIEnv* env);
@@ -1147,7 +1146,6 @@ static const RegJNIRec gRegJNI[] = { 
    REG_JNI(register_android_os_FileUtils),

    REG_JNI(register_android_os_FileUtils),

    REG_JNI(register_android_os_MessageQueue),

    REG_JNI(register_android_os_MessageQueue),

    REG_JNI(register_android_os_ParcelFileDescriptor),

    REG_JNI(register_android_os_ParcelFileDescriptor),

    REG_JNI(register_android_os_Power),

    REG_JNI(register_android_os_StatFs),

    REG_JNI(register_android_os_StatFs),

    REG_JNI(register_android_os_Trace),

    REG_JNI(register_android_os_Trace),

    REG_JNI(register_android_os_UEventObserver),

    REG_JNI(register_android_os_UEventObserver),