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

Dump the default broswer in SettingsDumpService

Browse Source 
In SettingsDumpService, add the feature to dump the default
broswer. When there is no default broswer, dump nothing.

Bug: 27043208
Test: make -j40 RunSettingsRoboTests
Change-Id: I5ce8180d419f8a0e921da72da28eccb36a523668
This commit is contained in:
jackqdyulei
2016-12-20 10:08:19 -08:00
parent d5afb5a60c
commit a9eb4a0ee2
2 changed files with 149 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/com/android/settings/SettingsDumpService.java
View File

@@ -16,14 +16,18 @@ package com.android.settings;
import android.app.Service;
import android.content.Intent;
import android.content.pm.PackageManager;
import android.content.pm.ResolveInfo;
import android.net.ConnectivityManager;
import android.net.NetworkTemplate;
import android.net.Uri;
import android.os.IBinder;
import android.os.storage.StorageManager;
import android.os.storage.VolumeInfo;
import android.telephony.SubscriptionInfo;
import android.telephony.SubscriptionManager;
import android.telephony.TelephonyManager;
import com.android.internal.annotations.VisibleForTesting;
import com.android.settings.applications.ProcStatsData;
import com.android.settingslib.net.DataUsageController;
import org.json.JSONArray;
@@ -35,6 +39,13 @@ import java.io.FileDescriptor;
import java.io.PrintWriter;
public class SettingsDumpService extends Service {
@VisibleForTesting static final String KEY_SERVICE = "service";
@VisibleForTesting static final String KEY_STORAGE = "storage";
@VisibleForTesting static final String KEY_DATAUSAGE = "datausage";
@VisibleForTesting static final String KEY_MEMORY = "memory";
@VisibleForTesting static final String KEY_DEFAULT_BROWSER_APP = "default_browser_app";
@VisibleForTesting static final Intent BROWSER_INTENT =
new Intent("android.intent.action.VIEW", Uri.parse("http://"));
@Override
public IBinder onBind(Intent intent) {
@@ -46,10 +57,11 @@ public class SettingsDumpService extends Service {
JSONObject dump = new JSONObject();
try {
dump.put("service", "Settings State");
dump.put("storage", dumpStorage());
dump.put("datausage", dumpDataUsage());
dump.put("memory", dumpMemory());
dump.put(KEY_SERVICE, "Settings State");
dump.put(KEY_STORAGE, dumpStorage());
dump.put(KEY_DATAUSAGE, dumpDataUsage());
dump.put(KEY_MEMORY, dumpMemory());
dump.put(KEY_DEFAULT_BROWSER_APP, dumpDefaultBrowser());
} catch (Exception e) {
e.printStackTrace();
}
@@ -127,4 +139,16 @@ public class SettingsDumpService extends Service {
}
return obj;
}
@VisibleForTesting
String dumpDefaultBrowser() {
final ResolveInfo resolveInfo = getPackageManager().resolveActivity(
BROWSER_INTENT, PackageManager.MATCH_DEFAULT_ONLY);
if (resolveInfo == null || resolveInfo.activityInfo.packageName.equals("android")) {
return null;
} else {
return resolveInfo.activityInfo.packageName;
}
}
}