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

Commit f621bc97 authored by Jeremy Joslin's avatar Jeremy Joslin
Browse files

Move NetworkScorerAppManager into com.android.server. 

NetworkScorerAppManager is only used internally by the
NetworkScoreService and no longer needs to be part of core.
Extracted its inner class, NetworkScorerAppData, into a top-level
class and left it in android.net as it's used as part of the
NetworkScoreManager API.

Test: runtest frameworks-services -c com.android.server.NetworkScorerAppManagerTest
Test: runtest frameworks-services -c com.android.server.NetworkScoreServiceTest
Bug: 35095406
Change-Id: I201f081e05d0a909b4ae3142b63afc3e21548f77
parent a6be4346

core/java/android/net/INetworkScoreService.aidl

+3 −3
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ package android.net; 


import android.net.INetworkScoreCache;

import android.net.NetworkKey;

import android.net.NetworkScorerAppManager;

import android.net.NetworkScorerAppData;

import android.net.RecommendationRequest;

import android.net.RecommendationResult;

import android.net.ScoredNetwork;
@@ -135,11 +135,11 @@ interface INetworkScoreService 
    /**

     * Returns metadata about the active scorer or <code>null</code> if there is no active scorer.

     */

    NetworkScorerAppManager.NetworkScorerAppData getActiveScorer();

    NetworkScorerAppData getActiveScorer();



    /**

     * Returns the list of available scorer apps. The list will be empty if there are

     * no valid scorers.

     */

    List<NetworkScorerAppManager.NetworkScorerAppData> getAllValidScorers();

    List<NetworkScorerAppData> getAllValidScorers();

}

core/java/android/net/NetworkScoreManager.java

+0 −2
Original line number Diff line number Diff line
@@ -18,7 +18,6 @@ package android.net; 


import static android.net.NetworkRecommendationProvider.EXTRA_RECOMMENDATION_RESULT;



import android.Manifest;

import android.annotation.IntDef;

import android.annotation.NonNull;

import android.annotation.Nullable;
@@ -26,7 +25,6 @@ import android.annotation.SdkConstant; 
import android.annotation.SdkConstant.SdkConstantType;

import android.annotation.SystemApi;

import android.content.Context;

import android.net.NetworkScorerAppManager.NetworkScorerAppData;

import android.os.Bundle;

import android.os.Handler;

import android.os.RemoteCallback;

core/java/android/net/NetworkScorerAppManager.aidl→core/java/android/net/NetworkScorerAppData.aidl

+1 −1
Original line number Diff line number Diff line
@@ -16,4 +16,4 @@ 


package android.net;



parcelable NetworkScorerAppManager.NetworkScorerAppData;
 
parcelable NetworkScorerAppData;

core/java/android/net/NetworkScorerAppData.java

0 → 100644
+99 −0
Original line number Diff line number Diff line 
package android.net;



import android.annotation.Nullable;

import android.content.ComponentName;

import android.os.Parcel;

import android.os.Parcelable;



import java.util.Objects;



/**

 * Holds metadata about a discovered network scorer/recommendation application.

 *

 * @hide

 */

public final class NetworkScorerAppData implements Parcelable {

    /** UID of the scorer app. */

    public final int packageUid;

    private final ComponentName mRecommendationService;

    /**

     * The {@link ComponentName} of the Activity to start before enabling the "connect to open

     * wifi networks automatically" feature.

     */

    private final ComponentName mEnableUseOpenWifiActivity;



    public NetworkScorerAppData(int packageUid, ComponentName recommendationServiceComp,

            ComponentName enableUseOpenWifiActivity) {

        this.packageUid = packageUid;

        this.mRecommendationService = recommendationServiceComp;

        this.mEnableUseOpenWifiActivity = enableUseOpenWifiActivity;

    }



    protected NetworkScorerAppData(Parcel in) {

        packageUid = in.readInt();

        mRecommendationService = ComponentName.readFromParcel(in);

        mEnableUseOpenWifiActivity = ComponentName.readFromParcel(in);

    }



    @Override

    public void writeToParcel(Parcel dest, int flags) {

        dest.writeInt(packageUid);

        ComponentName.writeToParcel(mRecommendationService, dest);

        ComponentName.writeToParcel(mEnableUseOpenWifiActivity, dest);

    }



    @Override

    public int describeContents() {

        return 0;

    }



    public static final Creator<NetworkScorerAppData> CREATOR =

            new Creator<NetworkScorerAppData>() {

                @Override

                public NetworkScorerAppData createFromParcel(Parcel in) {

                    return new NetworkScorerAppData(in);

                }



                @Override

                public NetworkScorerAppData[] newArray(int size) {

                    return new NetworkScorerAppData[size];

                }

            };



    public String getRecommendationServicePackageName() {

        return mRecommendationService.getPackageName();

    }



    public ComponentName getRecommendationServiceComponent() {

        return mRecommendationService;

    }



    @Nullable

    public ComponentName getEnableUseOpenWifiActivity() {

        return mEnableUseOpenWifiActivity;

    }



    @Override

    public String toString() {

        return "NetworkScorerAppData{" +

                "packageUid=" + packageUid +

                ", mRecommendationService=" + mRecommendationService +

                ", mEnableUseOpenWifiActivity=" + mEnableUseOpenWifiActivity +

                '}';

    }



    @Override

    public boolean equals(Object o) {

        if (this == o) return true;

        if (o == null || getClass() != o.getClass()) return false;

        NetworkScorerAppData that = (NetworkScorerAppData) o;

        return packageUid == that.packageUid &&

                Objects.equals(mRecommendationService, that.mRecommendationService) &&

                Objects.equals(mEnableUseOpenWifiActivity, that.mEnableUseOpenWifiActivity);

    }



    @Override

    public int hashCode() {

        return Objects.hash(packageUid, mRecommendationService, mEnableUseOpenWifiActivity);

    }

}

services/core/java/com/android/server/NetworkScoreService.java

+1 −2
Original line number Diff line number Diff line
@@ -35,8 +35,7 @@ import android.net.INetworkScoreCache; 
import android.net.INetworkScoreService;

import android.net.NetworkKey;

import android.net.NetworkScoreManager;

import android.net.NetworkScorerAppManager;

import android.net.NetworkScorerAppManager.NetworkScorerAppData;

import android.net.NetworkScorerAppData;

import android.net.RecommendationRequest;

import android.net.RecommendationResult;

import android.net.ScoredNetwork;