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

Commit a4620793 authored by Jeff Sharkey's avatar Jeff Sharkey
Browse files

Observe screen on/off events in NetworkPolicy. 

The POLICY_REJECT_BACKGROUND policy requires that network traffic be
blocked when a UID goes into the background.  Even if the UID has an
activity in the foreground, it's considered "background" if the screen
is turned off.

This changes watches for SCREEN_ON/OFF broadcasts, and rule generation
now observes screen state.  It also introduces an observer pattern so
that ActivityManager doesn't directly know about NetworkPolicy, and
moves the service management into SystemServer.

Change-Id: Ie7a84929d3ca60ae4578d47e19d5a8da10fd8d58
parent 442fa21e

Android.mk

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

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

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

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

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

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

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

core/java/android/app/ActivityManagerNative.java

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

        }



        case REGISTER_PROCESS_OBSERVER_TRANSACTION: {

            data.enforceInterface(IActivityManager.descriptor);

            IProcessObserver observer = IProcessObserver.Stub.asInterface(

                    data.readStrongBinder());

            registerProcessObserver(observer);

            return true;

        }



        case UNREGISTER_PROCESS_OBSERVER_TRANSACTION: {

            data.enforceInterface(IActivityManager.descriptor);

            IProcessObserver observer = IProcessObserver.Stub.asInterface(

                    data.readStrongBinder());

            unregisterProcessObserver(observer);

            return true;

        }



        }



        return super.onTransact(code, data, reply, flags);
@@ -3300,5 +3316,27 @@ class ActivityManagerProxy implements IActivityManager 
        return result;

    }



    public void registerProcessObserver(IProcessObserver 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_PROCESS_OBSERVER_TRANSACTION, data, reply, 0);

        reply.readException();

        data.recycle();

        reply.recycle();

    }



    public void unregisterProcessObserver(IProcessObserver 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_PROCESS_OBSERVER_TRANSACTION, data, reply, 0);

        reply.readException();

        data.recycle();

        reply.recycle();

    }



    private IBinder mRemote;

}

core/java/android/app/IActivityManager.java

+5 −0
Original line number Diff line number Diff line
@@ -355,6 +355,9 @@ public interface IActivityManager extends IInterface { 


    public boolean removeTask(int taskId, int flags) throws RemoteException;



    public void registerProcessObserver(IProcessObserver observer) throws RemoteException;

    public void unregisterProcessObserver(IProcessObserver observer) throws RemoteException;



    /*

     * Private non-Binder interfaces

     */
@@ -577,4 +580,6 @@ public interface IActivityManager extends IInterface { 
    int SWITCH_USER_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+127;

    int REMOVE_SUB_TASK_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+128;

    int REMOVE_TASK_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+129;

    int REGISTER_PROCESS_OBSERVER_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+130;

    int UNREGISTER_PROCESS_OBSERVER_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+131;

}

core/java/android/app/IProcessObserver.aidl

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

 * Copyright (C) 2011 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 IProcessObserver {



    void onForegroundActivitiesChanged(int pid, int uid, boolean foregroundActivities);

    void onProcessDied(int pid, int uid);



}

core/java/android/net/INetworkPolicyManager.aidl

+0 −3
Original line number Diff line number Diff line
@@ -23,9 +23,6 @@ package android.net; 
 */

interface INetworkPolicyManager {



    void onForegroundActivitiesChanged(int uid, int pid, boolean foregroundActivities);

    void onProcessDied(int uid, int pid);



    void setUidPolicy(int uid, int policy);

    int getUidPolicy(int uid);