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

Commit 3e147d72 authored by Matt Walliser's avatar Matt Walliser Committed by Automerger Merge Worker
Browse files

Merge "Small changes needed to support CTS testing." into udc-dev am: 9fa5b76d 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21484347



Change-Id: I87ab34dbb2a9808c091f5b7b2ffddc7d31883d55
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 64f14cfb 9fa5b76d

core/api/test-current.txt

+9 −0
Original line number Diff line number Diff line
@@ -1948,12 +1948,21 @@ package android.net { 
package android.net.wifi.sharedconnectivity.app {



  public class SharedConnectivityManager {

    method @Nullable public static android.net.wifi.sharedconnectivity.app.SharedConnectivityManager create(@NonNull android.content.Context, @NonNull String, @NonNull String);

    method @Nullable public android.content.ServiceConnection getServiceConnection();

    method public void setService(@Nullable android.os.IInterface);

  }



}



package android.net.wifi.sharedconnectivity.service {



  public abstract class SharedConnectivityService extends android.app.Service {

    method public void onBind();

  }



}



package android.os {



  public final class BatteryStatsManager {

wifi/java/src/android/net/wifi/sharedconnectivity/app/SharedConnectivityManager.java

+12 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ package android.net.wifi.sharedconnectivity.app; 
import android.annotation.CallbackExecutor;

import android.annotation.NonNull;

import android.annotation.Nullable;

import android.annotation.SuppressLint;

import android.annotation.SystemApi;

import android.annotation.TestApi;

import android.content.ComponentName;
@@ -172,6 +173,17 @@ public class SharedConnectivityManager { 
        return null;

    }



    /**

     * @hide

     */

    @SuppressLint("ManagerLookup")

    @TestApi

    @Nullable

    public static SharedConnectivityManager create(@NonNull Context context,

            @NonNull String servicePackageName, @NonNull String serviceIntentAction) {

        return new SharedConnectivityManager(context, servicePackageName, serviceIntentAction);

    }



    private SharedConnectivityManager(@NonNull Context context, String servicePackageName,

            String serviceIntentAction) {

        mServiceConnection = new ServiceConnection() {

wifi/java/src/android/net/wifi/sharedconnectivity/service/SharedConnectivityService.java

+9 −2
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ import android.annotation.NonNull; 
import android.annotation.Nullable;

import android.annotation.RequiresPermission;

import android.annotation.SystemApi;

import android.annotation.TestApi;

import android.app.Service;

import android.content.Intent;

import android.content.pm.PackageManager;
@@ -90,7 +91,7 @@ public abstract class SharedConnectivityService extends Service { 
    public final IBinder onBind(@NonNull Intent intent) {

        if (DEBUG) Log.i(TAG, "onBind intent=" + intent);

        mHandler = new Handler(getMainLooper());

        return new ISharedConnectivityService.Stub() {

        IBinder serviceStub = new ISharedConnectivityService.Stub() {

            @Override

            public void registerCallback(ISharedConnectivityCallback callback) {

                checkPermissions();
@@ -138,8 +139,14 @@ public abstract class SharedConnectivityService extends Service { 
                }

            }

        };

        onBind(); // For CTS testing

        return serviceStub;

    }



    /** @hide */

    @TestApi

    public void onBind() {}



    private void onRegisterCallback(ISharedConnectivityCallback callback) {

        // Listener gets triggered on first register using cashed data

        if (!notifyTetherNetworkUpdate(callback) || !notifyKnownNetworkUpdate(callback)