Merge "Migrated search for SubInfoRecord to Utils." into lmp-mr1-dev
diff --git a/src/com/android/settings/applications/InstalledAppDetails.java b/src/com/android/settings/applications/InstalledAppDetails.java
index 2f1dc85..3aa948d 100755
--- a/src/com/android/settings/applications/InstalledAppDetails.java
+++ b/src/com/android/settings/applications/InstalledAppDetails.java
@@ -731,7 +731,9 @@
Log.i(TAG, "Have " + prefActList.size() + " number of activities in preferred list");
boolean hasUsbDefaults = false;
try {
- hasUsbDefaults = mUsbManager.hasDefaults(packageName, UserHandle.myUserId());
+ if (mUsbManager != null) {
+ hasUsbDefaults = mUsbManager.hasDefaults(packageName, UserHandle.myUserId());
+ }
} catch (RemoteException e) {
Log.e(TAG, "mUsbManager.hasDefaults", e);
}
@@ -1380,17 +1382,19 @@
} else if(v == mSpecialDisableButton) {
showDialogInner(DLG_SPECIAL_DISABLE, 0);
} else if(v == mActivitiesButton) {
- mPm.clearPackagePreferredActivities(packageName);
- try {
- mUsbManager.clearDefaults(packageName, UserHandle.myUserId());
- } catch (RemoteException e) {
- Log.e(TAG, "mUsbManager.clearDefaults", e);
+ if (mUsbManager != null) {
+ mPm.clearPackagePreferredActivities(packageName);
+ try {
+ mUsbManager.clearDefaults(packageName, UserHandle.myUserId());
+ } catch (RemoteException e) {
+ Log.e(TAG, "mUsbManager.clearDefaults", e);
+ }
+ mAppWidgetManager.setBindAppWidgetPermission(packageName, false);
+ TextView autoLaunchTitleView =
+ (TextView) mRootView.findViewById(R.id.auto_launch_title);
+ TextView autoLaunchView = (TextView) mRootView.findViewById(R.id.auto_launch);
+ resetLaunchDefaultsUi(autoLaunchTitleView, autoLaunchView);
}
- mAppWidgetManager.setBindAppWidgetPermission(packageName, false);
- TextView autoLaunchTitleView =
- (TextView) mRootView.findViewById(R.id.auto_launch_title);
- TextView autoLaunchView = (TextView) mRootView.findViewById(R.id.auto_launch);
- resetLaunchDefaultsUi(autoLaunchTitleView, autoLaunchView);
} else if(v == mClearDataButton) {
if (mAppEntry.info.manageSpaceActivityName != null) {
if (!Utils.isMonkeyRunning()) {
diff --git a/src/com/android/settings/dashboard/SearchResultsSummary.java b/src/com/android/settings/dashboard/SearchResultsSummary.java
index 1ae0c25..0a43ce9 100644
--- a/src/com/android/settings/dashboard/SearchResultsSummary.java
+++ b/src/com/android/settings/dashboard/SearchResultsSummary.java
@@ -279,7 +279,8 @@
setSuggestionsVisibility(false);
updateSearchResults();
saveQueryToDatabase();
- return true;
+
+ return false;
}
public boolean onQueryTextChange(String query) {
diff --git a/src/com/android/settings/sim/SimSettings.java b/src/com/android/settings/sim/SimSettings.java
index eeb83d4..6b12985 100644
--- a/src/com/android/settings/sim/SimSettings.java
+++ b/src/com/android/settings/sim/SimSettings.java
@@ -115,33 +115,6 @@
private PreferenceCategory mSimCards = null;
private int mNumSims;
- /**
- * Standard projection for the interesting columns of a normal note.
- */
- private static final String[] sProjection = new String[] {
- Telephony.Carriers._ID, // 0
- Telephony.Carriers.NAME, // 1
- Telephony.Carriers.APN, // 2
- Telephony.Carriers.PROXY, // 3
- Telephony.Carriers.PORT, // 4
- Telephony.Carriers.USER, // 5
- Telephony.Carriers.SERVER, // 6
- Telephony.Carriers.PASSWORD, // 7
- Telephony.Carriers.MMSC, // 8
- Telephony.Carriers.MCC, // 9
- Telephony.Carriers.MNC, // 10
- Telephony.Carriers.NUMERIC, // 11
- Telephony.Carriers.MMSPROXY,// 12
- Telephony.Carriers.MMSPORT, // 13
- Telephony.Carriers.AUTH_TYPE, // 14
- Telephony.Carriers.TYPE, // 15
- Telephony.Carriers.PROTOCOL, // 16
- Telephony.Carriers.CARRIER_ENABLED, // 17
- Telephony.Carriers.BEARER, // 18
- Telephony.Carriers.ROAMING_PROTOCOL, // 19
- Telephony.Carriers.MVNO_TYPE, // 20
- Telephony.Carriers.MVNO_MATCH_DATA // 21
- };
public SimSettings() {
super(DISALLOW_CONFIG_SIM);
@@ -439,16 +412,10 @@
final Resources res = getResources();
if (mSubInfoRecord != null) {
- if(TextUtils.isEmpty(mSubInfoRecord.getDisplayName())) {
- setTitle(getCarrierName());
- String displayName = getCarrierName();
- mSubInfoRecord.setDisplayName(displayName);
- SubscriptionManager.setDisplayName(displayName,
- mSubInfoRecord.getSubscriptionId());
- } else {
- setTitle(mSubInfoRecord.getDisplayName());
- }
- setSummary(mSubInfoRecord.getNumber());
+ setTitle(String.format(res.getString(R.string.sim_editor_title),
+ (mSubInfoRecord.getSimSlotIndex() + 1)));
+ setSummary(mSubInfoRecord.getDisplayName() + " - " +
+ mSubInfoRecord.getNumber().toString());
setEnabled(true);
} else {
setSummary(R.string.sim_slot_empty);
@@ -457,14 +424,6 @@
}
}
- public String getCarrierName() {
- Uri mUri = ContentUris.withAppendedId(Telephony.Carriers.CONTENT_URI,
- mSubInfoRecord.getSubscriptionId());
- Cursor mCursor = getActivity().managedQuery(mUri, sProjection, null, null);
- mCursor.moveToFirst();
- return mCursor.getString(1);
- }
-
public String getFormattedPhoneNumber() {
try{
final String rawNumber = PhoneFactory.getPhone(mSlotId).getLine1Number();
@@ -524,7 +483,7 @@
numberView.setText(simPref.getFormattedPhoneNumber());
TextView carrierView = (TextView)dialogLayout.findViewById(R.id.carrier);
- carrierView.setText(getCarrierName());
+ carrierView.setText(mSubInfoRecord.getCarrierName());
builder.setTitle(String.format(res.getString(R.string.sim_editor_title),
(mSubInfoRecord.getSimSlotIndex() + 1)));