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

Commit cab3eb0c authored by Jeff Davidson's avatar Jeff Davidson Committed by Android (Google) Code Review
Browse files

Merge "Fix default scorer provisioning." into lmp-dev

parents a69adf75 56f9f73a

core/java/android/provider/Settings.java

+8 −0
Original line number Diff line number Diff line
@@ -6469,6 +6469,14 @@ public final class Settings { 
         */

        public static final String GUEST_USER_ENABLED = "guest_user_enabled";



        /**

         * Whether the NetworkScoringService has been first initialized.

         * <p>

         * Type: int (0 for false, 1 for true)

         * @hide

         */

        public static final String NETWORK_SCORING_PROVISIONED = "network_scoring_provisioned";



        /**

         * Settings to backup. This is here so that it's in the same place as the settings

         * keys and easy to update.

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

+5 −7
Original line number Diff line number Diff line
@@ -17,9 +17,9 @@ 
package com.android.server;



import android.Manifest.permission;

import android.content.ContentResolver;

import android.content.Context;

import android.content.Intent;

import android.content.SharedPreferences;

import android.content.pm.PackageManager;

import android.net.INetworkScoreCache;

import android.net.INetworkScoreService;
@@ -30,6 +30,7 @@ import android.net.ScoredNetwork; 
import android.os.Binder;

import android.os.RemoteException;

import android.os.UserHandle;

import android.provider.Settings;

import android.text.TextUtils;

import android.util.Log;
@@ -51,9 +52,6 @@ import java.util.Set; 
public class NetworkScoreService extends INetworkScoreService.Stub {

    private static final String TAG = "NetworkScoreService";



    /** SharedPreference bit set to true after the service is first initialized. */

    private static final String PREF_SCORING_PROVISIONED = "is_provisioned";



    private final Context mContext;



    private final Map<Integer, INetworkScoreCache> mScoreCaches;
@@ -65,8 +63,8 @@ public class NetworkScoreService extends INetworkScoreService.Stub { 


    /** Called when the system is ready to run third-party code but before it actually does so. */

    void systemReady() {

        SharedPreferences prefs = mContext.getSharedPreferences(TAG, Context.MODE_PRIVATE);

        if (!prefs.getBoolean(PREF_SCORING_PROVISIONED, false)) {

        ContentResolver cr = mContext.getContentResolver();

        if (Settings.Global.getInt(cr, Settings.Global.NETWORK_SCORING_PROVISIONED, 0) == 0) {

            // On first run, we try to initialize the scorer to the one configured at build time.

            // This will be a no-op if the scorer isn't actually valid.

            String defaultPackage = mContext.getResources().getString(
@@ -74,7 +72,7 @@ public class NetworkScoreService extends INetworkScoreService.Stub { 
            if (!TextUtils.isEmpty(defaultPackage)) {

                NetworkScorerAppManager.setActiveScorer(mContext, defaultPackage);

            }

            prefs.edit().putBoolean(PREF_SCORING_PROVISIONED, true).apply();

            Settings.Global.putInt(cr, Settings.Global.NETWORK_SCORING_PROVISIONED, 1);

        }

    }