From 9d9366004eaffb6688591fa393be6b7429f22b99 Mon Sep 17 00:00:00 2001 From: Guang Zhu Date: Tue, 19 May 2015 11:08:39 -0700 Subject: [PATCH 1/3] Monkey should not be allowed to switch USB mode Change-Id: Ifb4865d234e0d9e6453f88d37c12744b9daefa62 --- .../android/settings/deviceinfo/UsbModeChooserActivity.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/com/android/settings/deviceinfo/UsbModeChooserActivity.java b/src/com/android/settings/deviceinfo/UsbModeChooserActivity.java index 76b2fd1900d..e0369d620a2 100644 --- a/src/com/android/settings/deviceinfo/UsbModeChooserActivity.java +++ b/src/com/android/settings/deviceinfo/UsbModeChooserActivity.java @@ -18,12 +18,14 @@ package com.android.settings.deviceinfo; import android.annotation.Nullable; import android.app.Activity; +import android.app.ActivityManager; import android.app.AlertDialog; import android.content.Context; import android.content.DialogInterface; import android.hardware.usb.UsbManager; import android.os.Bundle; import android.util.Log; + import com.android.settings.R; /** @@ -46,7 +48,9 @@ public class UsbModeChooserActivity extends Activity { new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int which) { - setCurrentFunction(which); + if (!ActivityManager.isUserAMonkey()) { + setCurrentFunction(which); + } dialog.dismiss(); UsbModeChooserActivity.this.finish(); } From fcb916b59c55438e0a1a57b429cb2b856dee8988 Mon Sep 17 00:00:00 2001 From: Jason Monk Date: Wed, 20 May 2015 13:35:43 -0400 Subject: [PATCH 2/3] Remove data item from app info when not supported Bug: 21207963 Change-Id: I91693d9a85c0905cbb021181967fa16aac61d3ea --- .../android/settings/SettingsActivity.java | 13 ++------ src/com/android/settings/Utils.java | 12 +++++++ .../applications/InstalledAppDetails.java | 32 ++++++++++++------- 3 files changed, 35 insertions(+), 22 deletions(-) diff --git a/src/com/android/settings/SettingsActivity.java b/src/com/android/settings/SettingsActivity.java index c256f5c8c9c..25adef1ba25 100644 --- a/src/com/android/settings/SettingsActivity.java +++ b/src/com/android/settings/SettingsActivity.java @@ -39,10 +39,7 @@ import android.content.res.XmlResourceParser; import android.nfc.NfcAdapter; import android.os.Bundle; import android.os.Handler; -import android.os.INetworkManagementService; import android.os.Message; -import android.os.RemoteException; -import android.os.ServiceManager; import android.os.UserHandle; import android.os.UserManager; import android.preference.Preference; @@ -1248,14 +1245,8 @@ public class SettingsActivity extends Activity } } else if (id == R.id.data_usage_settings) { // Remove data usage when kernel module not enabled - final INetworkManagementService netManager = INetworkManagementService.Stub - .asInterface(ServiceManager.getService(Context.NETWORKMANAGEMENT_SERVICE)); - try { - if (!netManager.isBandwidthControlEnabled()) { - removeTile = true; - } - } catch (RemoteException e) { - // ignored + if (!Utils.isBandwidthControlEnabled()) { + removeTile = true; } } else if (id == R.id.battery_settings) { // Remove battery settings when battery is not available. (e.g. TV) diff --git a/src/com/android/settings/Utils.java b/src/com/android/settings/Utils.java index 4ddba80522b..d3d515e5189 100644 --- a/src/com/android/settings/Utils.java +++ b/src/com/android/settings/Utils.java @@ -55,7 +55,9 @@ import android.net.Uri; import android.os.BatteryManager; import android.os.Bundle; import android.os.IBinder; +import android.os.INetworkManagementService; import android.os.RemoteException; +import android.os.ServiceManager; import android.os.UserHandle; import android.os.UserManager; import android.os.storage.StorageManager; @@ -1179,4 +1181,14 @@ public final class Utils { return null; } } + + public static boolean isBandwidthControlEnabled() { + final INetworkManagementService netManager = INetworkManagementService.Stub + .asInterface(ServiceManager.getService(Context.NETWORKMANAGEMENT_SERVICE)); + try { + return netManager.isBandwidthControlEnabled(); + } catch (RemoteException e) { + return false; + } + } } \ No newline at end of file diff --git a/src/com/android/settings/applications/InstalledAppDetails.java b/src/com/android/settings/applications/InstalledAppDetails.java index 4eb86a90791..e625a979b0c 100755 --- a/src/com/android/settings/applications/InstalledAppDetails.java +++ b/src/com/android/settings/applications/InstalledAppDetails.java @@ -226,12 +226,16 @@ public class InstalledAppDetails extends AppInfoBase setHasOptionsMenu(true); addPreferencesFromResource(R.xml.installed_app_details); - INetworkStatsService statsService = INetworkStatsService.Stub.asInterface( - ServiceManager.getService(Context.NETWORK_STATS_SERVICE)); - try { - mStatsSession = statsService.openSession(); - } catch (RemoteException e) { - throw new RuntimeException(e); + if (Utils.isBandwidthControlEnabled()) { + INetworkStatsService statsService = INetworkStatsService.Stub.asInterface( + ServiceManager.getService(Context.NETWORK_STATS_SERVICE)); + try { + mStatsSession = statsService.openSession(); + } catch (RemoteException e) { + throw new RuntimeException(e); + } + } else { + removePreference(KEY_DATA); } mBatteryHelper = new BatteryStatsHelper(getActivity(), true); } @@ -249,9 +253,11 @@ public class InstalledAppDetails extends AppInfoBase } AppItem app = new AppItem(mAppEntry.info.uid); app.addUid(mAppEntry.info.uid); - getLoaderManager().restartLoader(LOADER_CHART_DATA, - ChartDataLoader.buildArgs(getTemplate(getContext()), app), - mDataCallbacks); + if (mStatsSession != null) { + getLoaderManager().restartLoader(LOADER_CHART_DATA, + ChartDataLoader.buildArgs(getTemplate(getContext()), app), + mDataCallbacks); + } new BatteryUpdater().execute(); } @@ -282,7 +288,9 @@ public class InstalledAppDetails extends AppInfoBase mPermissionsPreference = findPreference(KEY_PERMISSION); mPermissionsPreference.setOnPreferenceClickListener(this); mDataPreference = findPreference(KEY_DATA); - mDataPreference.setOnPreferenceClickListener(this); + if (mDataPreference != null) { + mDataPreference.setOnPreferenceClickListener(this); + } mBatteryPreference = findPreference(KEY_BATTERY); mBatteryPreference.setEnabled(false); mBatteryPreference.setOnPreferenceClickListener(this); @@ -458,7 +466,9 @@ public class InstalledAppDetails extends AppInfoBase mPm, context)); mNotificationPreference.setSummary(getNotificationSummary(mAppEntry, context, mBackend)); - mDataPreference.setSummary(getDataSummary()); + if (mDataPreference != null) { + mDataPreference.setSummary(getDataSummary()); + } updateBattery(); From db006f8db424aefadc093456f522ec12f5e50cb9 Mon Sep 17 00:00:00 2001 From: Jason Monk Date: Fri, 22 May 2015 13:41:48 -0400 Subject: [PATCH 3/3] String changes for app links in settings Bug: 21372846 Change-Id: I76cc684c8f8f42555af36f754291d6ba99acb4e4 --- res/values/strings.xml | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/res/values/strings.xml b/res/values/strings.xml index c00d904dcd6..e7870828959 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -2993,7 +2993,7 @@ Storage - Launch by default + Open by default Defaults @@ -6379,16 +6379,16 @@ - Launch by default + Open by default %1$s used in %2$s - Domain links - Open Domain URLs - Allow app to directly open Domain URLs - Supported domains URLs + App links + Open supported links + Open without asking + Supported links Other defaults @@ -6492,22 +6492,22 @@ Double-tap anywhere on the screen to wake device - Domain URLs + App links - Don\u2019t open any domain URL + Don\u2019t open supported links - Open \u2018%s\u2019 + Open %s - Open \u2018%s\u2019 and related URLs + Open %s and related URLs - No app can open any domain URL - One app can open its domain URLs - %d apps can open their domain URLs + No app can open any supported link + One app can open its supported links + %d apps can open their supported links