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

Commit 8e3f2954 authored by Dianne Hackborn's avatar Dianne Hackborn Committed by Android (Google) Code Review
Browse files

Merge "Update power manager to track uid state like netstats." into mnc-dev

parents 5ddde02a d23e0d69

Android.mk

+1 −0
Original line number Diff line number Diff line
@@ -84,6 +84,7 @@ LOCAL_SRC_FILES += \ 
	core/java/android/app/job/IJobScheduler.aidl \

	core/java/android/app/job/IJobService.aidl \

	core/java/android/app/ITransientNotification.aidl \

	core/java/android/app/IUidObserver.aidl \

	core/java/android/app/IUiAutomationConnection.aidl \

	core/java/android/app/IUiModeManager.aidl \

	core/java/android/app/IUserSwitchObserver.aidl \

core/java/android/app/ActivityManagerNative.java

+38 −0
Original line number Diff line number Diff line
@@ -1970,6 +1970,22 @@ public abstract class ActivityManagerNative extends Binder implements IActivityM 
            return true;

        }



        case REGISTER_UID_OBSERVER_TRANSACTION: {

            data.enforceInterface(IActivityManager.descriptor);

            IUidObserver observer = IUidObserver.Stub.asInterface(

                    data.readStrongBinder());

            registerUidObserver(observer);

            return true;

        }



        case UNREGISTER_UID_OBSERVER_TRANSACTION: {

            data.enforceInterface(IActivityManager.descriptor);

            IUidObserver observer = IUidObserver.Stub.asInterface(

                    data.readStrongBinder());

            unregisterUidObserver(observer);

            return true;

        }



        case GET_PACKAGE_ASK_SCREEN_COMPAT_TRANSACTION:

        {

            data.enforceInterface(IActivityManager.descriptor);
@@ -5077,6 +5093,28 @@ class ActivityManagerProxy implements IActivityManager 
        reply.recycle();

    }



    public void registerUidObserver(IUidObserver observer) throws RemoteException {

        Parcel data = Parcel.obtain();

        Parcel reply = Parcel.obtain();

        data.writeInterfaceToken(IActivityManager.descriptor);

        data.writeStrongBinder(observer != null ? observer.asBinder() : null);

        mRemote.transact(REGISTER_UID_OBSERVER_TRANSACTION, data, reply, 0);

        reply.readException();

        data.recycle();

        reply.recycle();

    }



    public void unregisterUidObserver(IUidObserver observer) throws RemoteException {

        Parcel data = Parcel.obtain();

        Parcel reply = Parcel.obtain();

        data.writeInterfaceToken(IActivityManager.descriptor);

        data.writeStrongBinder(observer != null ? observer.asBinder() : null);

        mRemote.transact(UNREGISTER_UID_OBSERVER_TRANSACTION, data, reply, 0);

        reply.readException();

        data.recycle();

        reply.recycle();

    }



    public boolean isIntentSenderTargetedToPackage(IIntentSender sender) throws RemoteException {

        Parcel data = Parcel.obtain();

        Parcel reply = Parcel.obtain();

core/java/android/app/IActivityManager.java

+5 −0
Original line number Diff line number Diff line
@@ -387,6 +387,9 @@ public interface IActivityManager extends IInterface { 
    public void registerProcessObserver(IProcessObserver observer) throws RemoteException;

    public void unregisterProcessObserver(IProcessObserver observer) throws RemoteException;



    public void registerUidObserver(IUidObserver observer) throws RemoteException;

    public void unregisterUidObserver(IUidObserver observer) throws RemoteException;



    public boolean isIntentSenderTargetedToPackage(IIntentSender sender) throws RemoteException;



    public boolean isIntentSenderAnActivity(IIntentSender sender) throws RemoteException;
@@ -844,4 +847,6 @@ public interface IActivityManager extends IInterface { 
    int UPDATE_DEVICE_OWNER_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+295;

    int UPDATE_PREFERRED_SETUP_ACTIVITY_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+296;

    int KEYGUARD_GOING_AWAY_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+297;

    int REGISTER_UID_OBSERVER_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+298;

    int UNREGISTER_UID_OBSERVER_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+299;

}

core/java/android/app/IUidObserver.aidl

0 → 100644
+23 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2015 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.app;



/** {@hide} */

oneway interface IUidObserver {

    void onUidStateChanged(int uid, int procState);

    void onUidGone(int uid);

}

core/java/android/os/PowerManagerInternal.java

+4 −0
Original line number Diff line number Diff line
@@ -136,4 +136,8 @@ public abstract class PowerManagerInternal { 
    public abstract void setDeviceIdleMode(boolean enabled);



    public abstract void setDeviceIdleWhitelist(int[] appids);



    public abstract void updateUidProcState(int uid, int procState);



    public abstract void uidGone(int uid);

}