PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add logging to default browser preference controller

Browse Source 
Bug: 38480521
Test: manual
Change-Id: I1b0d389f0aa6cc4c9d1895e4cae4d0561df0f0ca
This commit is contained in:
Fan Zhang
2017-05-25 12:22:21 -07:00
parent 21aab578c9
commit 378967484a
1 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/com/android/settings/applications/defaultapps/DefaultBrowserPreferenceController.java
View File

@@ -18,16 +18,20 @@ package com.android.settings.applications.defaultapps;
import android.content.Context; import android.content.Context;
import android.content.Intent; import android.content.Intent;
import android.content.pm.ComponentInfo;
import android.content.pm.PackageManager; import android.content.pm.PackageManager;
import android.content.pm.ResolveInfo; import android.content.pm.ResolveInfo;
import android.net.Uri; import android.net.Uri;
import android.support.v7.preference.Preference; import android.support.v7.preference.Preference;
import android.text.TextUtils; import android.text.TextUtils;
import android.util.Log;
import java.util.List; import java.util.List;
public class DefaultBrowserPreferenceController extends DefaultAppPreferenceController { public class DefaultBrowserPreferenceController extends DefaultAppPreferenceController {
private static final String TAG = "BrowserPrefCtrl";
static final Intent BROWSE_PROBE = new Intent() static final Intent BROWSE_PROBE = new Intent()
.setAction(Intent.ACTION_VIEW) .setAction(Intent.ACTION_VIEW)
.addCategory(Intent.CATEGORY_BROWSABLE) .addCategory(Intent.CATEGORY_BROWSABLE)
@@ -60,9 +64,10 @@ public class DefaultBrowserPreferenceController extends DefaultAppPreferenceCont
@Override @Override
protected DefaultAppInfo getDefaultAppInfo() { protected DefaultAppInfo getDefaultAppInfo() {
try { try {
final String packageName = mPackageManager.getDefaultBrowserPackageNameAsUser(mUserId);
Log.d(TAG, "Get default browser package: " + packageName);
return new DefaultAppInfo(mPackageManager, return new DefaultAppInfo(mPackageManager,
mPackageManager.getPackageManager().getApplicationInfo( mPackageManager.getPackageManager().getApplicationInfo(packageName, 0));
mPackageManager.getDefaultBrowserPackageNameAsUser(mUserId), 0));
} catch (PackageManager.NameNotFoundException e) { } catch (PackageManager.NameNotFoundException e) {
return null; return null;
} }
@@ -90,7 +95,12 @@ public class DefaultBrowserPreferenceController extends DefaultAppPreferenceCont
// Resolve that intent and check that the handleAllWebDataURI boolean is set // Resolve that intent and check that the handleAllWebDataURI boolean is set
final List<ResolveInfo> list = getCandidates(); final List<ResolveInfo> list = getCandidates();
if (list != null && list.size() == 1) { if (list != null && list.size() == 1) {
return list.get(0).loadLabel(mPackageManager.getPackageManager()).toString(); final ResolveInfo info = list.get(0);
final String label = info.loadLabel(mPackageManager.getPackageManager()).toString();
final ComponentInfo cn = info.getComponentInfo();
final String packageName = cn == null ? null : cn.packageName;
Log.d(TAG, "Getting label for the only browser app: " + packageName + label);
return label;
} }
return null; return null;
} }