OSDN Git Service
Treehugger Robot [Tue, 28 Mar 2017 04:54:19 +0000 (04:54 +0000)]
Merge "Initialize LDAC to ABR mode"
fen wang [Mon, 13 Mar 2017 10:57:25 +0000 (19:57 +0900)]
Initialize LDAC to ABR mode
Bug:
35381097
Change-Id: Idcc2fabe86acaf441f5a71f5d2bb66ad29252cdb
Treehugger Robot [Tue, 28 Mar 2017 01:12:13 +0000 (01:12 +0000)]
Merge "Revert "Development Options: toggle binderized hals""
Robin Lee [Mon, 27 Mar 2017 16:18:19 +0000 (16:18 +0000)]
Merge "[VpnSettings]Crash when activity has been recycled"
Treehugger Robot [Sat, 25 Mar 2017 04:14:57 +0000 (04:14 +0000)]
Merge "Show correct Wi-Fi status when switching to multi window mode"
Treehugger Robot [Sat, 25 Mar 2017 00:58:13 +0000 (00:58 +0000)]
Merge "Add default value to Bluetooth AVRCP version property get"
liurong [Fri, 24 Mar 2017 12:11:48 +0000 (20:11 +0800)]
[VpnSettings]Crash when activity has been recycled
This is a case we found in monkey test, the main thread handles message while the activity has been recycled. It will raise a NullPointerException when we use getActivity() in following lines.
Assumpt the situation is: settings run in background and activity been recycled quickly, but handler still in the process.
Test: NA
Change-Id: I19db4f13e13294618ec8e42e4d9c54ce23504344
Signed-off-by: liurong <liurong@xiaomi.com>
Ajay Panicker [Thu, 23 Mar 2017 00:43:51 +0000 (17:43 -0700)]
Add default value to Bluetooth AVRCP version property get
When the property isn't set a crash can occur since we try to look up an
empty property value.
Bug:
36531010
Test: Open Developer options after a factory reset
Change-Id: I82c0fde00774ab1a4f3e4c44a715c74d4a7804e9
Treehugger Robot [Thu, 23 Mar 2017 17:49:56 +0000 (17:49 +0000)]
Merge "AVRCP version interop pereference (2/3)"
Steven Moreland [Thu, 23 Mar 2017 05:07:46 +0000 (05:07 +0000)]
Revert "Development Options: toggle binderized hals"
This reverts commit
73dd0ae30e2779cb845d1ac6e785d619e1e1e310.
Reason for revert: b/
34274385 - This was a temporary setting.
Change-Id: I98b2d05c431bb5361b11cd3b05b7f5ac4e939e0e
Sanket Padawe [Wed, 22 Mar 2017 21:27:21 +0000 (21:27 +0000)]
Merge "Update SubscriptionManager API by replacing 'id' & 'idx' with 'index'."
Ajay Panicker [Mon, 20 Mar 2017 18:34:54 +0000 (11:34 -0700)]
AVRCP version interop pereference (2/3)
Add a mechanism to allow the user to select the AVRCP version broadcasted
through SDP in the developer options. This helps solve some interoperability
issues such as with Honda Carkits where broadcasting AVRCP version 1.6 causes
media metadata to fail.
Bug:
35956792
Test: Select AVRCP version through developer option
Merged-In: I7d4b1bd23342d1a96ffdf08bb7d6d3c5e5fedca6
Change-Id: I7d4b1bd23342d1a96ffdf08bb7d6d3c5e5fedca6
Sanket Padawe [Mon, 20 Mar 2017 22:08:07 +0000 (15:08 -0700)]
Update SubscriptionManager API by replacing 'id' & 'idx' with 'index'.
Bug:
35767068
Test: No build failure on update.
Change-Id: Ib7211a9d0c10a717bfd5a7b22b8bea2b3973d12f
Merged-in: Ib7211a9d0c10a717bfd5a7b22b8bea2b3973d12f
Treehugger Robot [Mon, 20 Mar 2017 21:37:37 +0000 (21:37 +0000)]
Merge "Bluetooth: stop pairing service correctly"
Marie Janssen [Mon, 20 Mar 2017 18:01:19 +0000 (11:01 -0700)]
Bluetooth: stop pairing service correctly
If BluetoothPairingService was stopped and restarted, it would receive
a null intent, and it also would not signal correctly when it needed to
be stopped.
Since restarts can happen, check that we are still bonding when starting.
Also prevent crashes when we might be called with a null intent.
Test: initiate pairing remotely, adb am kill service, notice no crash
Bug:
36130262
Change-Id: I408811935fdb36591826f4481d103cf4799db27e
Treehugger Robot [Thu, 16 Mar 2017 17:23:29 +0000 (17:23 +0000)]
Merge "Optimized Code: call direct method to get integer extra"
liurong [Thu, 16 Mar 2017 11:52:40 +0000 (19:52 +0800)]
Optimized Code: call direct method to get integer extra
Description: Make the default preferred sim slot as the first one(0) when get PREFERRED_SIM.
Test: NA
Change-Id: Id54bdbefd413c58ecd637cb8ff522861ead79331
Signed-off-by: liurong <liurong@xiaomi.com>
Treehugger Robot [Wed, 15 Mar 2017 22:49:56 +0000 (22:49 +0000)]
Merge "Bluetooth: leave screen off for permission request"
Treehugger Robot [Wed, 15 Mar 2017 19:11:25 +0000 (19:11 +0000)]
Merge "Improve Wi-Fi Settings UI in guest mode"
Jay [Thu, 14 Jul 2016 08:31:03 +0000 (16:31 +0800)]
Improve Wi-Fi Settings UI in guest mode
Progress bar is still seen along with a permission forbidden tip in
guest mode and it's confusing. It should be hidden because actually
nothing happens there.
When Wi-Fi is off, Wi-Fi OFF tip should be shown even in guest mode
becuase it should be consistent with Wi-Fi status.
Improves
d8c3ca43163427a75c8b70114096238177f97af0.
Bug:
31235488
Test: manual inspection.
Change-Id: I611719db253a0aec03d61e881af0e5dc3869d50b
Merged-In: If89728e293721cea45dcd717316d87f6df17ea7c
Jeff Sharkey [Sun, 12 Mar 2017 23:03:20 +0000 (23:03 +0000)]
Merge "Fix network name for Passpoint network"
Marie Janssen [Fri, 10 Mar 2017 17:28:06 +0000 (09:28 -0800)]
Bluetooth: leave screen off for permission request
Test: pair to a carkit, disable pbap, reconnect from carkit
Bug:
32555940
Change-Id: I06d6cc0873f9f991e68f1de9b629dbe3a7bb7701
Zhihong Li [Fri, 23 Sep 2016 01:38:42 +0000 (09:38 +0800)]
Show correct Wi-Fi status when switching to multi window mode
In WifiSettings, when switching to multi window mode,
WifiSettings fragment is recreated and "onPause()" is called,
then WifiTracker stops and wrong Wi-Fi status is shown.
Move "WifiTracker.startTracking()" to "onStart()",
"WifiTracker.stopTracking()" to "onStop()"
to make sure to show correct Wi-Fi status.
Bug:
36078677
Test: Manual test OK
Change-Id: I215f180b1082f6039c03de8b4a3ca27d1f364c75
Treehugger Robot [Mon, 6 Mar 2017 23:02:12 +0000 (23:02 +0000)]
Merge "Changes event handling phases for DeviceListPreferenceFragment."
Jaewoong Jung [Thu, 13 Oct 2016 18:08:22 +0000 (11:08 -0700)]
Changes event handling phases for DeviceListPreferenceFragment.
Bug:
31273140
Test: Manual inspection.
Change-Id: If4622b8d367813eb86a54a45f2e8fa4a55ca38b1
(cherry picked from commit
e8d5c8fda16c75e4bcca3a218bc5cf7b254baa99)
Treehugger Robot [Mon, 6 Mar 2017 03:57:50 +0000 (03:57 +0000)]
Merge "Display the correct default for mobile data always on."
Treehugger Robot [Mon, 6 Mar 2017 01:17:55 +0000 (01:17 +0000)]
Merge "Unify the design of add icon in setting"
Lorenzo Colitti [Fri, 3 Mar 2017 07:17:15 +0000 (16:17 +0900)]
Display the correct default for mobile data always on.
Mobile data always on was enabled by changing the default in
ConnectivityService to 1. However, the default value in the
developer options setting was left at 0. This means that by
default (i.e., when the setting is empty), mobile data always on
is enabled but appears in developer options as disabled.
Fix this by changing the default in developer options. This is
simpler than the other options (adding database upgrade code to
settings, making the default be controlled by config.xml and
ensuring that when a config changed broadcast is received the
value is re-rease, hardcoding a default value as an @hide
constant in Settings, etc.)
Bug:
23113288
Test: setting is off after "adb shell settings delete global mobile_data_always_on"
Change-Id: I27e2c0af7a03e510e640dbcfa281449d00385154
minoru.x.sakuma [Mon, 28 Oct 2013 10:35:11 +0000 (19:35 +0900)]
Unify the design of add icon in setting
Add icon "+" displayed in APN setting differs from ones in other
settings like VPN settings, SIP accounts etc. Change the icon to
align with others.
Bug:
35936472
Test: Manually check icon display with fix
Change-Id: I99a57fbeb55bb04f911d28e85752ec04edab6f0e
Treehugger Robot [Thu, 2 Mar 2017 16:52:42 +0000 (16:52 +0000)]
Merge "wifi: use Passpoint API when forgetting a Passpoint network"
Treehugger Robot [Wed, 1 Mar 2017 19:26:15 +0000 (19:26 +0000)]
Merge "Change default long-press time to 400ms"
Treehugger Robot [Wed, 1 Mar 2017 19:20:25 +0000 (19:20 +0000)]
Merge "Show search results when query string contains trailing space"
Peter Qiu [Wed, 1 Mar 2017 17:07:34 +0000 (09:07 -0800)]
wifi: use Passpoint API when forgetting a Passpoint network
Use WifiManager#removePasspointConfiguration when forgetting a
Passpoint network to remove the configuration.
This maintains the legacy behavior, where forgetting a Passpoint
network/AP will remove its provider's profile.
Bug:
34207710
Test: manual test
Change-Id: I8b7f6d9fb20fa9f0f0d90566f76c2a39308ce420
long.x.qiao [Tue, 29 Nov 2016 05:50:51 +0000 (13:50 +0800)]
Show search results when query string contains trailing space
The query expression used to search for a term prefix is the prefix
itself with a '*' character appended to it. However, if query string
contains trailing space, the query expresssion (e.g. "screen *") doesn't
work. So to fix this issue, the unnecessary trailing space should be
removed.
Bug:
35231587
Test: manual - go to search in Settings and enter "screen "
Change-Id: Ifa5d96f5d38ad5454272f140da440b8ff55d5614
Treehugger Robot [Mon, 27 Feb 2017 18:25:04 +0000 (18:25 +0000)]
Merge "WiFiCallingSettings: don't start carrier app in onResume"
Meng Wang [Thu, 23 Feb 2017 22:33:49 +0000 (14:33 -0800)]
WiFiCallingSettings: don't start carrier app in onResume
onResume initialize UI before registering switch change listener.
So that listener is not invoked in UI initialization, but only real
switch change by user.
Bug:
33680334
Test: make
Test: manual - carrier app is not invoked in onResume
Change-Id: I7ca1eb1eab214b50c8de72946590c1ecb676d4df
Treehugger Robot [Sat, 25 Feb 2017 13:39:27 +0000 (13:39 +0000)]
Merge "Bluetooth: aim OPEN_RECEIVED_FILES at bluetooth"
Marie Janssen [Thu, 23 Feb 2017 19:20:56 +0000 (11:20 -0800)]
Bluetooth: aim OPEN_RECEIVED_FILES at bluetooth
Bluetooth is the receiver for the OPEN_RECEIVED_FILES intent, so we
should aim the intent directly at them.
Test: go to BT settings and click "Open Received Files" in the context
Change-Id: I057215f1faf04c8c735a7e9340325716225ad22d
Fix:
35246073
Chen Xu [Sat, 25 Feb 2017 01:05:30 +0000 (01:05 +0000)]
Merge "move ACTION_CARRIER_SETUP intent to public api"
fionaxu [Fri, 24 Feb 2017 18:42:12 +0000 (10:42 -0800)]
move ACTION_CARRIER_SETUP intent to public api
As per CDD: The "android.*" namespace for intent constants is reserved
for public
Android API in AOSP. (Whether public to the full SDK, @SystemApi or
defined in AOSP support libraries.)
ACTION_CARRIER_SETUP intent is generally useful for carrier privileged
apps which is unbundled carrier apps, thus move to public APIs
33679956
Test: Manual
Bug:
33679956
Merged-in: I85dfa99d0b20bb1b534dfe8ead3c274a5c739786
Change-Id: I84ffd5f2c8c3418689ee3d5ff5ddc3f9f7959763
Marie Janssen [Thu, 23 Feb 2017 21:41:05 +0000 (21:41 +0000)]
Merge "Bluetooth: service for pairing notification"
Marie Janssen [Wed, 15 Feb 2017 02:49:17 +0000 (18:49 -0800)]
Bluetooth: service for pairing notification
Use a foreground service to show the notification, separating dialog
creation from the receiver.
Test: pair request from remote device while the screen is off
Bug:
35234069
Change-Id: Ia3be3e8efdacf465e095af5a498ef5eb0fca83cd
Li Bai [Tue, 31 Jan 2017 06:51:19 +0000 (15:51 +0900)]
Change default long-press time to 400ms
The default long-press time has been changed from 500ms to 400ms by
b/
30159825. so the values for the list of long-press timeout options
in Settings app should be changed.
Bug:
35226519
Test: manual - go to Settings > Accessibility > Touch & hold delay
Change-Id: I8e2421ea4119742bb6bf0e27688c65e3de3099dc
Treehugger Robot [Sat, 11 Feb 2017 01:21:25 +0000 (01:21 +0000)]
Merge "Add null pointer checks when updating A2DP configuration values"
Pavlin Radoslavov [Fri, 10 Feb 2017 20:52:04 +0000 (12:52 -0800)]
Add null pointer checks when updating A2DP configuration values
Under expected circumstances, those null pointer checks are not
needed: onCreate() is always called before onCreateView(),
and the former creates the objects: mBluetoothSelectA2dpCodec,
mBluetoothSelectA2dpSampleRate, mBluetoothSelectA2dpBitsPerSample,
mBluetoothSelectA2dpChannelMode, mBluetoothSelectA2dpLdacPlaybackQuality .
For some unknown reason, somehow the following chain of calls is executed
before onCreate() :
onCreateView() ->
getActivity().registerReceiver(mBluetoothA2dpReceiver, ...) ->
mBluetoothA2dpReceiver.onReceive(...) ->
updateBluetoothA2dpConfigurationValues()
Adding the null pointer checks until the issue is understood.
Test: Code compilation
Bug:
35204511
Change-Id: I7c1d81015e66b26544b7b26f36cbc75f11713496
Treehugger Robot [Fri, 10 Feb 2017 18:12:00 +0000 (18:12 +0000)]
Merge "Remove Bluetooth autoconnect on dock"
Sooraj Sasindran [Fri, 10 Feb 2017 05:38:40 +0000 (05:38 +0000)]
Merge "Provide calling package name in cell info APIs"
Marie Janssen [Fri, 10 Feb 2017 04:02:52 +0000 (20:02 -0800)]
Remove Bluetooth autoconnect on dock
Test: compiles
Change-Id: I31305c70269c685893132f14975c32a051280afc
Fix:
35219649
Sooraj Sasindran [Thu, 18 Aug 2016 22:49:49 +0000 (15:49 -0700)]
Provide calling package name in cell info APIs
Provide calling package name in cell info APIs
BUG=
31041780
Merged-In: Iad6e5c67ead2bf50d83d1ccad48c3f0341f53712
Change-Id: Iad6e5c67ead2bf50d83d1ccad48c3f0341f53712
Treehugger Robot [Tue, 7 Feb 2017 04:45:35 +0000 (04:45 +0000)]
Merge "Catch IllegalStateException when updating Bluetooth A2DP codec info"
Pavlin Radoslavov [Mon, 6 Feb 2017 23:37:01 +0000 (15:37 -0800)]
Catch IllegalStateException when updating Bluetooth A2DP codec info
Add an explicit check when calling getResources() inside
updateBluetoothA2dpConfigurationValues().
This fixes a potential race condition - the latter could be called
in background when processing intent update.
Bug:
35021206
Test: Manual UI testing
Change-Id: I38117c5b1e08f4b2ecfd7637bb3e34920aa0d296
Treehugger Robot [Thu, 2 Feb 2017 04:29:15 +0000 (04:29 +0000)]
Merge "Add missing null pointer check for Bluetooth A2DP Codec Settings"
Pavlin Radoslavov [Thu, 2 Feb 2017 01:40:39 +0000 (17:40 -0800)]
Add missing null pointer check for Bluetooth A2DP Codec Settings
Bug:
34885602
Test: Code compilation
Change-Id: I13443390e7c6ffa34b5957a588fc0cefdf5b80f5
Marie Janssen [Tue, 31 Jan 2017 19:09:34 +0000 (19:09 +0000)]
Merge "Bluetooth: remove unused SINK_STATE_CHANGED action"
Pavlin Radoslavov [Tue, 31 Jan 2017 19:02:35 +0000 (19:02 +0000)]
Merge "Update the A2DP Codec Config API"
Pavlin Radoslavov [Sat, 28 Jan 2017 01:19:56 +0000 (17:19 -0800)]
Update the A2DP Codec Config API
Previously, the JNI upcall would contain only the current codec config.
In the new API, the upcall contains:
1. The current codec config
2. The list of codecs containing the local codecs capabilities
3. The list of codecs containing the selectable codecs capabilities.
This list is the intersection of the local codecs capabilities
and the capabilities of the paired device.
Also, refactored the Java internals to accomodate the extra information:
* Added new class BluetoothCodecStatus that contains the extra info:
current codec config, local codecs capabilities and selectable
codecs capabilities
* Renamed method getCodecConfig() to getCodecStatus() and return the
corresponding BluetoothCodecStatus object.
* Updates to class BluetoothCodecConfig:
new methods isValid(), getCodecName(), and updated toString()
so it is more user friendly
* Removed BluetoothCodecConfig.EXTRA_CODEC_CONFIG and
EXTRA_PREVIOUS_CODEC_CONFIG.
The former is superseded by BluetoothCodecStatus.EXTRA_CODEC_STATUS;
the latter is not really used.
Test: A2DP streaming with headsets and switching the codecs
Change-Id: I490a70c82b686be7105862aeaeafcff495369dae
Marie Janssen [Sat, 28 Jan 2017 02:57:39 +0000 (18:57 -0800)]
Bluetooth: remove unused SINK_STATE_CHANGED action
android.bluetooth.a2dp.action.SINK_STATE_CHANGED is unused.
Test: compiles
Bug:
34395439
Change-Id: I5c347886fdf9dbdf15feb82f2a9622dd22f010b6
Marie Janssen [Mon, 30 Jan 2017 17:46:17 +0000 (17:46 +0000)]
Merge "Bluetooth: remove BluetoothDiscoveryReceiver"
Marie Janssen [Tue, 24 Jan 2017 22:21:29 +0000 (14:21 -0800)]
Bluetooth: remove BluetoothDiscoveryReceiver
Use new function getDiscoveryEndMillis() to replace use of shared preferences
and intents.
Test: scan recently, then connect from external BT device
Bug:
34395439
Change-Id: Ia498b3bb4868b656cbbb9fbdc607a49af948343b
Treehugger Robot [Thu, 26 Jan 2017 19:12:54 +0000 (19:12 +0000)]
Merge "Integration of the AAC codec for A2DP source"
Pavlin Radoslavov [Sat, 14 Jan 2017 08:50:59 +0000 (00:50 -0800)]
Integration of the AAC codec for A2DP source
Test: A2DP streaming to AAC headsets
Bug:
30958229
Change-Id: Icef9ce9fb8e41cad65bc57bf078513d0c7bf7b9a
Treehugger Robot [Thu, 26 Jan 2017 09:57:38 +0000 (09:57 +0000)]
Merge "Development Options: toggle binderized hals"
Steven Moreland [Fri, 13 Jan 2017 19:31:41 +0000 (11:31 -0800)]
Development Options: toggle binderized hals
This allows for quick performance testing and also for a better
dogfooding experience.
Bug:
34256441
Test: Verification with getprop.
Change-Id: I81c5e0b1044d4569a6fe55a4b30f7e21c4465fc2
Marie Janssen [Wed, 25 Jan 2017 16:02:13 +0000 (16:02 +0000)]
Merge "Make headset icons consistent before / after pairing"
Xiaodong Xu [Mon, 25 May 2015 07:37:05 +0000 (09:37 +0200)]
Make headset icons consistent before / after pairing
Previously A2DP would be shown before pairing with a HFP device.
bug:
30677445
Change-Id: I0e9ab17197e6ee099d890d5368def36a14ca8344
Robin Lee [Thu, 19 Jan 2017 23:02:20 +0000 (23:02 +0000)]
Merge "Clear VPN after Clear credentials if VPN is being established"
Treehugger Robot [Thu, 19 Jan 2017 15:13:14 +0000 (15:13 +0000)]
Merge "Prepare for removal of legacy-test from default targets"
Paul Duffin [Tue, 17 Jan 2017 14:49:42 +0000 (14:49 +0000)]
Prepare for removal of legacy-test from default targets
In preparation for removing junit classes from the Android API
the legacy-test target will be removed from the
TARGET_DEFAULT_JAVA_LIBRARIES. This change adds explicit
dependencies on junit and/or legacy-android-test to ensure that
modules will compile properly once it is removed.
Bug:
30188076
Test: make checkbuild
Merged-In: I5d2c0685b74ea5ba368c777d9646b9d3ac24dca9
Change-Id: I980111b4b83d16ccd9d3a277ab2587bf638a2c8a
Treehugger Robot [Wed, 18 Jan 2017 20:20:47 +0000 (20:20 +0000)]
Merge "Update/cleanup Bluetooth Codec strings in Developer Settings"
Pavlin Radoslavov [Wed, 18 Jan 2017 01:14:24 +0000 (17:14 -0800)]
Update/cleanup Bluetooth Codec strings in Developer Settings
* Use the summary strings instead of the titles strings as appropriate.
* Use proper translatable strings instead of hard-coded "Streaming: "
embedded string.
Test: UI visual observation
Change-Id: I0222afc30c75e68e2568c33c781755802d86c502
insight.lee [Mon, 16 Jan 2017 23:27:01 +0000 (08:27 +0900)]
Clear VPN after Clear credentials if VPN is being established
1. There is no way to disconnect VPN after 'Clear credentials'
without removing whole Internet connection because VPN profile to
disconnect is removed when Clear credentials.
2. This commit checks whether VPN is being established or not when
Clear credentials and disconnect VPN if VPN is being established.
Lastly, this shows a toast message to inform VPN disconnected.
Test: manual - took a photo
Signed-off-by : Sungmin Lee <insight.lee@lge.com>
Bug:
29093779
Change-Id: Id5ea01c8731b3b0fca2a31d9d84e8c103952b377
Treehugger Robot [Wed, 11 Jan 2017 06:07:39 +0000 (06:07 +0000)]
Merge "Moved the Bluetooth-related default config init within onCreate()"
Pavlin Radoslavov [Tue, 10 Jan 2017 23:40:13 +0000 (15:40 -0800)]
Moved the Bluetooth-related default config init within onCreate()
This should avoid potential crashes in case somehow onCreateView() is
called without onCreate() being called first.
Test: Manual UI interaction with Developer Settings
Bug:
34192829
Change-Id: Iaf46d05f30d20f98727c4dbfb91feef8509c92f7
Treehugger Robot [Tue, 10 Jan 2017 21:15:55 +0000 (21:15 +0000)]
Merge "Some Wi-Fi Menus like WPS should be disabled when Wi-Fi is off"
Yanhong Shen [Fri, 1 Jul 2016 07:25:19 +0000 (15:25 +0800)]
Some Wi-Fi Menus like WPS should be disabled when Wi-Fi is off
When Wi-Fi is off, Advanced menus below should be disabled:
1. "Wi-Fi Direct"
2. "WPS Push Button"
3. "WPS Pin Entry"
in Settings->Wi-Fi->Advanced.
Bug:
31102679
Test: Test with the device
Change-Id: I5af4c18512c991211eb42ef759e00917828f1b4c
Treehugger Robot [Sat, 7 Jan 2017 01:19:33 +0000 (01:19 +0000)]
Merge "Add Bluetooth Codec selection UI to the Developer Options"
Pavlin Radoslavov [Thu, 5 Jan 2017 18:52:21 +0000 (10:52 -0800)]
Add Bluetooth Codec selection UI to the Developer Options
Test: A2DP streaming to headsets and manual UI interaction
Bug:
30958229
Change-Id: I75027200561e6c51fa767c427ed09b647757d0ab
Treehugger Robot [Thu, 5 Jan 2017 18:04:12 +0000 (18:04 +0000)]
Merge "Update Android Beam feature summary string"
Ruchi Kandoi [Fri, 23 Dec 2016 01:33:01 +0000 (17:33 -0800)]
Update Android Beam feature summary string
Bug:
32183480
Test: compiles
Change-Id: I750e998ea73b10645666c7d080afe7320b705d47
Signed-off-by: Ruchi Kandoi <kandoiruchi@google.com>
Treehugger Robot [Wed, 28 Dec 2016 18:43:26 +0000 (18:43 +0000)]
Merge "Handle SubSettings instance leaks in Index.java"
gaochong [Wed, 21 Dec 2016 12:06:37 +0000 (20:06 +0800)]
Handle SubSettings instance leaks in Index.java
Index's constructor will hold context of caller.
context.getApplicationContext() instead of context to prevent activity
leaks.
Bug: https://code.google.com/p/android/issues/detail?id=223322
Test: manual-start a new activity call Index constructor ,then pressed
back.
Change-Id: Ic12af62f9b718d328610a57985f64ca4629bab99
Signed-off-by: gaochong <gaochong@xiaomi.com>
Robin Lee [Fri, 23 Dec 2016 10:29:02 +0000 (10:29 +0000)]
Merge "Update VPN preference state after disallow configuring VPN policy has changed."
insight.lee [Thu, 22 Dec 2016 07:14:44 +0000 (16:14 +0900)]
Update VPN preference state after disallow configuring VPN policy has changed.
1. When Settings > More and change disallow configuring VPN policy
and resume Settings, update VPN preference state.
2. When Settings > More > VPN and change disallow configuring VPN policy
and resume VPN Settings, update its state.
Test: manual
Signed-off-by : Sungmin Lee <insight.lee@lge.com>
Change-Id: I4f3c85733ca6ba05cba46e2f4854f54a42b10c21
nharold [Wed, 21 Dec 2016 21:40:21 +0000 (21:40 +0000)]
Merge "Always include BAND_MODE=AUTOMATIC in the Radio Band Mode List"
Nathan Harold [Tue, 20 Dec 2016 02:04:52 +0000 (18:04 -0800)]
Always include BAND_MODE=AUTOMATIC in the Radio Band Mode List
To facilitate user recovery from issues where the band mode
list is incomplete and may not report the full list of bands,
the user should *always* have the ability to set the band mode
selection to AUTOMATIC.
Bug:
28124606
Test: compilation, UI check
Change-Id: Ib961d9b058ade5a51dfec0777971c8c98dee2033
Treehugger Robot [Mon, 19 Dec 2016 21:54:52 +0000 (21:54 +0000)]
Merge "New pref toggle for network recommendations."
Jeremy Joslin [Tue, 13 Dec 2016 22:14:45 +0000 (14:14 -0800)]
New pref toggle for network recommendations.
Adding a new toggle to control whether network
recommendations are enabled.
Removed the "Use open networks" pref and its associated strings
and components as it's no longer needed.
Test: Built and ran.
BUG:
33549591
BUG:
33270391
Change-Id: I03069ca30d06089600ca958f8da117564189f839
Merged-In: I7248ac32e0598d82107c150372c1fe4e9e2243a5
Merged-In: I82eed6dc7daef1c622ea4e33ce42c331e0cd786d
Treehugger Robot [Wed, 14 Dec 2016 05:30:16 +0000 (05:30 +0000)]
Merge "Fix crash when rotating HighPowerDetail dialog"
Marie Janssen [Mon, 12 Dec 2016 21:27:23 +0000 (21:27 +0000)]
Merge "DO NOT MERGE Add Bluetooth toggle prompts - settings"
Svetoslav Ganov [Sat, 23 Jul 2016 03:08:41 +0000 (20:08 -0700)]
DO NOT MERGE Add Bluetooth toggle prompts - settings
If permission review is enabled toggling bluetoth on or off
results in a user prompt to collect consent. This applies
only to legacy apps, i.e. ones that don't support runtime
permissions as they target SDK 22.
bug:
28715749
Change-Id: I0b9065446f9d0cfb819065eaf2dc160eb1c1f7ec
Zhendong Yang [Thu, 24 Mar 2016 02:54:49 +0000 (10:54 +0800)]
Fix crash when rotating HighPowerDetail dialog
When rotating the device, the Activity of the target
Fragment become null. So NullPointerException occurs.
The dialog should check if the Activity is null
before calling onActivityResult().
Bug:
28333723
Test: manual - go to Settings > Apps > Clock,
click Battery optimization and rotate device
Change-Id: I7f68d6ece7d169fd96d04c1788e55ee506aae1ae
Treehugger Robot [Fri, 9 Dec 2016 20:50:39 +0000 (20:50 +0000)]
Merge "Fix apn can't be updated when pressing back key"
Bill Yi [Thu, 1 Dec 2016 18:11:25 +0000 (10:11 -0800)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
32177112
Change-Id: Ib08dd2e3c6b87cc0fbdc16bb167f4e167e52b020
Amin Shaikh [Thu, 1 Dec 2016 02:11:06 +0000 (02:11 +0000)]
Merge "Refactor NetworkScoreAppManager for testing."
am:
512368a22e
Change-Id: I597c960d5e56014b23b280e1e73e324efa77f8fb
Treehugger Robot [Thu, 1 Dec 2016 01:59:13 +0000 (01:59 +0000)]
Merge "Refactor NetworkScoreAppManager for testing."
Stephen Chen [Wed, 30 Nov 2016 23:59:43 +0000 (23:59 +0000)]
Merge "Link WIFI_SAVED_NETWORK_SETTINGS action with activity."
am:
666c9d7ea5
Change-Id: I1b193660453cbc492d83501f8e9fe3b544e6e4b2
Treehugger Robot [Wed, 30 Nov 2016 20:25:12 +0000 (20:25 +0000)]
Merge "Link WIFI_SAVED_NETWORK_SETTINGS action with activity."
Amin Shaikh [Tue, 22 Nov 2016 01:28:47 +0000 (17:28 -0800)]
Refactor NetworkScoreAppManager for testing.
Test: manually running app
Change-Id: Icd828886b7181529fa2bf414ba631bce6d1b4d44
Stephen Chen [Tue, 15 Nov 2016 00:24:08 +0000 (16:24 -0800)]
Link WIFI_SAVED_NETWORK_SETTINGS action with activity.
Bug:
32738882
Test: gts test
Change-Id: Ie92e55fd1b0fbb7ba90b3f378a888b098dcf3287
Bill Yi [Mon, 21 Nov 2016 00:12:14 +0000 (16:12 -0800)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
32177112
Change-Id: Id8af490796464cb8422fa4be023af34baee73002