From e4d398b32afd81bd48148e75c95653bb230cd521 Mon Sep 17 00:00:00 2001
From: Jeff Davidson <jpd@google.com>
Date: Mon, 23 Jun 2014 18:17:43 -0700
Subject: [PATCH] Update change scorer dialog to use new label field.

Bug: 15775300
Change-Id: I61a7d1966742d463508e6801b7845ced8392db84
---
 .../settings/ActiveNetworkScorerDialog.java   | 29 +++++--------------
 1 file changed, 8 insertions(+), 21 deletions(-)

diff --git a/src/com/android/settings/ActiveNetworkScorerDialog.java b/src/com/android/settings/ActiveNetworkScorerDialog.java
index 35d35d12330..020549ff5d9 100644
--- a/src/com/android/settings/ActiveNetworkScorerDialog.java
+++ b/src/com/android/settings/ActiveNetworkScorerDialog.java
@@ -19,17 +19,15 @@ package com.android.settings;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
-import android.content.pm.PackageManager;
-import android.content.pm.PackageManager.NameNotFoundException;
 import android.net.NetworkScoreManager;
 import android.net.NetworkScorerAppManager;
+import android.net.NetworkScorerAppManager.NetworkScorerAppData;
 import android.os.Bundle;
 import android.text.TextUtils;
 import android.util.Log;
 
 import com.android.internal.app.AlertActivity;
 import com.android.internal.app.AlertController;
-import com.android.settings.R;
 
 /**
  * Dialog to allow a user to select a new network scorer.
@@ -71,13 +69,14 @@ public final class ActiveNetworkScorerDialog extends AlertActivity implements
     }
 
     private boolean buildDialog() {
-        if (!NetworkScorerAppManager.isPackageValidScorer(this, mNewPackageName)) {
+        NetworkScorerAppData newScorer = NetworkScorerAppManager.getScorer(this, mNewPackageName);
+        if (newScorer == null) {
             Log.e(TAG, "New package " + mNewPackageName + " is not a valid scorer.");
             return false;
         }
 
-        String oldPackageName = NetworkScorerAppManager.getActiveScorer(this);
-        if (TextUtils.equals(oldPackageName, mNewPackageName)) {
+        NetworkScorerAppData oldScorer = NetworkScorerAppManager.getActiveScorer(this);
+        if (oldScorer != null && TextUtils.equals(oldScorer.mPackageName, mNewPackageName)) {
             Log.i(TAG, "New package " + mNewPackageName + " is already the active scorer.");
             // Set RESULT_OK to indicate to the caller that the "switch" was successful.
             setResult(RESULT_OK);
@@ -85,24 +84,12 @@ public final class ActiveNetworkScorerDialog extends AlertActivity implements
         }
 
         // Compose dialog.
-        PackageManager pm = getPackageManager();
-        CharSequence oldName = null;
-        CharSequence newName;
-        try {
-            if (oldPackageName != null) {
-                oldName = pm.getApplicationInfo(oldPackageName, 0).loadLabel(pm);
-            }
-            newName = pm.getApplicationInfo(mNewPackageName, 0).loadLabel(pm);
-        } catch (NameNotFoundException e) {
-            Log.e(TAG, "Unable to find package info for scorers", e);
-            return false;
-        }
-
+        CharSequence newName = newScorer.mScorerName;
         final AlertController.AlertParams p = mAlertParams;
         p.mTitle = getString(R.string.network_scorer_change_active_dialog_title);
-        if (oldPackageName != null) {
+        if (oldScorer != null) {
             p.mMessage = getString(R.string.network_scorer_change_active_dialog_text, newName,
-                    oldName);
+                    oldScorer.mScorerName);
         } else {
             p.mMessage = getString(R.string.network_scorer_change_active_no_previous_dialog_text,
                     newName);