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

Commit d9eb4fce authored by Michal Karpinski's avatar Michal Karpinski Committed by Android (Google) Code Review
Browse files

Merge changes from topic 'network-logging-nyc-mr2-dev' into nyc-mr2-dev 

* changes:
  DO NOT MERGE Fixes in comments for NetworkEvent, DnsEvent and ConnectEvent
  DO NOT MERGE Fix Lint errors for network logging API
  DO NOT MERGE Logging when the new batch of network logs broadcast is sent to DO
  DO NOT MERGE Disable DO single user features when clearDeviceOwner() is called regardless of the amount of users
  DO NOT MERGE Fix disabling DO single user features when clearDeviceOwner() is called
  DO NOT MERGE [DPM] Minor code fixes in NetworkLoggingHandler
  DO NOT MERGE [DPM] DO uses batch token to retrieve network logs, and can retrieve the same batch many times
  DO NOT MERGE [DPM] Management and retrieval of network logs
  DO NOT MERGE [DPM] DO can start network logging and listen for events
parents 3661a6f9 e3639a0a

Android.mk

+4 −0
Original line number Diff line number Diff line
@@ -202,6 +202,7 @@ LOCAL_SRC_FILES += \ 
	core/java/android/net/IIpConnectivityMetrics.aidl \

	core/java/android/net/IEthernetManager.aidl \

	core/java/android/net/IEthernetServiceListener.aidl \

	core/java/android/net/INetdEventCallback.aidl \

	core/java/android/net/INetworkManagementEventObserver.aidl \

	core/java/android/net/INetworkPolicyListener.aidl \

	core/java/android/net/INetworkPolicyManager.aidl \
@@ -574,6 +575,9 @@ aidl_files := \ 
	frameworks/base/graphics/java/android/graphics/drawable/Icon.aidl \

	frameworks/base/core/java/android/accounts/AuthenticatorDescription.aidl \

	frameworks/base/core/java/android/accounts/Account.aidl \

	frameworks/base/core/java/android/app/admin/ConnectEvent.aidl \

	frameworks/base/core/java/android/app/admin/DnsEvent.aidl \

	frameworks/base/core/java/android/app/admin/NetworkEvent.aidl \

	frameworks/base/core/java/android/app/admin/SystemUpdatePolicy.aidl \

	frameworks/base/core/java/android/print/PrintDocumentInfo.aidl \

	frameworks/base/core/java/android/print/PageRange.aidl \

core/java/android/app/admin/ConnectEvent.aidl

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

 * Copyright (C) 2016 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.admin;



/** {@hide} */

parcelable ConnectEvent;

core/java/android/app/admin/ConnectEvent.java

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

 * Copyright (C) 2016 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.admin;



import android.os.Parcel;

import android.os.Parcelable;



/**

 * A class that represents a connect library call event.

 * @hide

 */

public final class ConnectEvent extends NetworkEvent implements Parcelable {



    /** The destination IP address. */

    private final String ipAddress;



    /** The destination port number. */

    private final int port;



    /** @hide */

    public ConnectEvent(String ipAddress, int port, String packageName, long timestamp) {

        super(packageName, timestamp);

        this.ipAddress = ipAddress;

        this.port = port;

    }



    private ConnectEvent(Parcel in) {

        this.ipAddress = in.readString();

        this.port = in.readInt();

        this.packageName = in.readString();

        this.timestamp = in.readLong();

    }



    public String getIpAddress() {

        return ipAddress;

    }



    public int getPort() {

        return port;

    }



    @Override

    public String toString() {

        return String.format("ConnectEvent(%s, %d, %d, %s)", ipAddress, port, timestamp,

                packageName);

    }



    public static final Parcelable.Creator<ConnectEvent> CREATOR

            = new Parcelable.Creator<ConnectEvent>() {

        @Override

        public ConnectEvent createFromParcel(Parcel in) {

            if (in.readInt() != PARCEL_TOKEN_CONNECT_EVENT) {

                return null;

            }

            return new ConnectEvent(in);

        }



        @Override

        public ConnectEvent[] newArray(int size) {

            return new ConnectEvent[size];

        }

    };



    @Override

    public int describeContents() {

        return 0;

    }



    @Override

    public void writeToParcel(Parcel out, int flags) {

        // write parcel token first

        out.writeInt(PARCEL_TOKEN_CONNECT_EVENT);

        out.writeString(ipAddress);

        out.writeInt(port);

        out.writeString(packageName);

        out.writeLong(timestamp);

    }

}

core/java/android/app/admin/DeviceAdminReceiver.java

+53 −0
Original line number Diff line number Diff line
@@ -275,6 +275,36 @@ public class DeviceAdminReceiver extends BroadcastReceiver { 
    public static final String ACTION_SECURITY_LOGS_AVAILABLE

            = "android.app.action.SECURITY_LOGS_AVAILABLE";



    /**

     * Broadcast action: notify that a new batch of network logs is ready to be collected.

     * @see DeviceAdminReceiver#onNetworkLogsAvailable

     * @hide

     */

    @SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION)

    public static final String ACTION_NETWORK_LOGS_AVAILABLE

            = "android.app.action.NETWORK_LOGS_AVAILABLE";



    /**

     * A {@code long} containing a token of the current batch of network logs, that has to be used

     * to retrieve the batch of logs by the device owner.

     *

     * @see #ACTION_NETWORK_LOGS_AVAILABLE

     * @see DevicePolicyManager#retrieveNetworkLogs

     * @hide

     */

    public static final String EXTRA_NETWORK_LOGS_TOKEN =

            "android.app.extra.EXTRA_NETWORK_LOGS_TOKEN";



    /**

     * An {@code int} count representing a total count of network logs inside the current batch of

     * network logs.

     *

     * @see #ACTION_NETWORK_LOGS_AVAILABLE

     * @hide

     */

    public static final String EXTRA_NETWORK_LOGS_COUNT =

            "android.app.extra.EXTRA_NETWORK_LOGS_COUNT";



    /**

     * A string containing the SHA-256 hash of the bugreport file.

     *
@@ -634,6 +664,25 @@ public class DeviceAdminReceiver extends BroadcastReceiver { 
    public void onSecurityLogsAvailable(Context context, Intent intent) {

    }



    /**

     * Called each time a new batch of network logs can be retrieved. This callback method will only

     * ever be called when network logging is enabled. The logs can only be retrieved while network

     * logging is enabled.

     *

     * <p>This callback is only applicable to device owners.

     *

     * @param context The running context as per {@link #onReceive}.

     * @param intent The received intent as per {@link #onReceive}.

     * @param batchToken The token representing the current batch of network logs.

     * @param networkLogsCount The total count of events in the current batch of network logs.

     * @see DevicePolicyManager#retrieveNetworkLogs(ComponentName)

     *

     * @hide

     */

    public void onNetworkLogsAvailable(Context context, Intent intent, long batchToken,

            int networkLogsCount) {

    }



    /**

     * Intercept standard device administrator broadcasts.  Implementations

     * should not override this method; it is better to implement the
@@ -688,6 +737,10 @@ public class DeviceAdminReceiver extends BroadcastReceiver { 
            onBugreportFailed(context, intent, failureCode);

        } else if (ACTION_SECURITY_LOGS_AVAILABLE.equals(action)) {

            onSecurityLogsAvailable(context, intent);

        } else if (ACTION_NETWORK_LOGS_AVAILABLE.equals(action)) {

            long batchToken = intent.getLongExtra(EXTRA_NETWORK_LOGS_TOKEN, -1);

            int networkLogsCount = intent.getIntExtra(EXTRA_NETWORK_LOGS_COUNT, 0);

            onNetworkLogsAvailable(context, intent, batchToken, networkLogsCount);

        }

    }

}

core/java/android/app/admin/DevicePolicyManager.java

+76 −0
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ import android.annotation.SdkConstant.SdkConstantType; 
import android.annotation.SystemApi;

import android.annotation.UserIdInt;

import android.app.Activity;

import android.app.admin.NetworkEvent;

import android.app.admin.SecurityLog.SecurityEvent;

import android.content.ComponentName;

import android.content.Context;
@@ -6609,4 +6610,79 @@ public class DevicePolicyManager { 
            throw re.rethrowFromSystemServer();

        }

    }



    /**

     * Called by a device owner to control the network logging feature. Logging can only be

     * enabled on single user devices where the sole user is managed by the device owner. If a new

     * user is added on the device, logging is disabled.

     *

     * <p> Network logs contain DNS lookup and connect() library call events.

     *

     * @param admin Which {@link DeviceAdminReceiver} this request is associated with.

     * @param enabled whether network logging should be enabled or not.

     * @throws {@link SecurityException} if {@code admin} is not a device owner.

     * @see #retrieveNetworkLogs

     *

     * @hide

     */

    public void setNetworkLoggingEnabled(@NonNull ComponentName admin, boolean enabled) {

        throwIfParentInstance("setNetworkLoggingEnabled");

        try {

            mService.setNetworkLoggingEnabled(admin, enabled);

        } catch (RemoteException re) {

            throw re.rethrowFromSystemServer();

        }

    }



    /**

     * Return whether network logging is enabled by a device owner.

     *

     * @param admin Which {@link DeviceAdminReceiver} this request is associated with.

     * @return {@code true} if network logging is enabled by device owner, {@code false} otherwise.

     * @throws {@link SecurityException} if {@code admin} is not a device owner.

     *

     * @hide

     */

    public boolean isNetworkLoggingEnabled(@NonNull ComponentName admin) {

        throwIfParentInstance("isNetworkLoggingEnabled");

        try {

            return mService.isNetworkLoggingEnabled(admin);

        } catch (RemoteException re) {

            throw re.rethrowFromSystemServer();

        }

    }



    /**

     * Called by device owner to retrieve the most recent batch of network logging events.

     * A device owner has to provide a batchToken provided as part of

     * {@link DeviceAdminReceiver#onNetworkLogsAvailable} callback. If the token doesn't match the

     * token of the most recent available batch of logs, {@code null} will be returned.

     *

     * <p> {@link NetworkEvent} can be one of {@link DnsEvent} or {@link ConnectEvent}.

     *

     * <p> The list of network events is sorted chronologically, and contains at most 1200 events.

     *

     * <p> Access to the logs is rate limited and this method will only return a new batch of logs

     * after the device device owner has been notified via

     * {@link DeviceAdminReceiver#onNetworkLogsAvailable}.

     *

     * @param admin Which {@link DeviceAdminReceiver} this request is associated with.

     * @param batchToken A token of the batch to retrieve

     * @return A new batch of network logs which is a list of {@link NetworkEvent}. Returns

     *        {@code null} if the batch represented by batchToken is no longer available or if

     *        logging is disabled.

     * @throws {@link SecurityException} if {@code admin} is not a device owner.

     * @see DeviceAdminReceiver#onNetworkLogsAvailable

     *

     * @hide

     */

    public @Nullable List<NetworkEvent> retrieveNetworkLogs(@NonNull ComponentName admin,

            long batchToken) {

        throwIfParentInstance("retrieveNetworkLogs");

        try {

            return mService.retrieveNetworkLogs(admin, batchToken);

        } catch (RemoteException re) {

            throw re.rethrowFromSystemServer();

        }

    }

}