OSDN Git Service
Marie Janssen [Wed, 25 Jan 2017 16:10:29 +0000 (16:10 +0000)]
Merge "Make headset icons consistent before / after pairing" am:
690bdb22c9 am:
a2e068a2b4
am:
60eb5503e8
Change-Id: Ida107059b3a5ec815f198659ff8174c8ff375efe
Marie Janssen [Wed, 25 Jan 2017 16:08:01 +0000 (16:08 +0000)]
Merge "Make headset icons consistent before / after pairing" am:
690bdb22c9
am:
a2e068a2b4
Change-Id: I036781f8908da81ea294abafaf6c72e9d03699c8
Marie Janssen [Wed, 25 Jan 2017 16:06:00 +0000 (16:06 +0000)]
Merge "Make headset icons consistent before / after pairing"
am:
690bdb22c9
Change-Id: I64a9a3a7d8a2f110ee1809af33583f82fc4b4f57
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
Stefano Tommasini [Sat, 21 Jan 2017 19:50:24 +0000 (19:50 +0000)]
Merge "Add SuggestionFeatureProvider interface." into nyc-mr2-dev
am:
bd16255ee1
Change-Id: Ia13886f7e3214e355db017b4463a956c0971b021
Stefanot [Sat, 21 Jan 2017 19:50:22 +0000 (19:50 +0000)]
Add SuggestionFeatureProvider interface.
am:
2eac39b393
Change-Id: I87fae019229983b97c19710b6cf73f4e1d05dff1
Stefano Tommasini [Sat, 21 Jan 2017 19:44:15 +0000 (19:44 +0000)]
Merge "Add SuggestionFeatureProvider interface." into nyc-mr2-dev
Stefanot [Fri, 13 Jan 2017 14:58:41 +0000 (14:58 +0000)]
Add SuggestionFeatureProvider interface.
The interface is added so that a vendor can add new suggestions to the
settings app, and customize details for these suggestions.
Test: make RunSettingsRoboTests
BUG:
34219298
Change-Id: I373c63709b1aaf68360aa2561a2ecfc3194e0e2b
Bill Yi [Sat, 21 Jan 2017 01:21:06 +0000 (01:21 +0000)]
Import translations. DO NOT MERGE
am:
2c570117a8 -s ours
Change-Id: Ibffbb54ef91658ce4df98228fd4e672995fa9aec
Bill Yi [Fri, 20 Jan 2017 20:31:51 +0000 (12:31 -0800)]
Import translations. DO NOT MERGE
Change-Id: I6aed674efc270223bddfd6fbdae50a98ae695276
Auto-generated-cl: translation import
Jack He [Thu, 19 Jan 2017 23:45:28 +0000 (23:45 +0000)]
Fix Bluetooth pairing dialogue crash
am:
e51972868c
Change-Id: I15e2263b5907f10f385d07e2797b43240e2eed65
Robin Lee [Thu, 19 Jan 2017 23:31:21 +0000 (23:31 +0000)]
Merge "Clear VPN after Clear credentials if VPN is being established" am:
4ce19f5c4f am:
fde3c6d74a
am:
185275e0ad
Change-Id: If1956964597ad1885dde00f23c55a4492f867977
Robin Lee [Thu, 19 Jan 2017 23:23:37 +0000 (23:23 +0000)]
Merge "Clear VPN after Clear credentials if VPN is being established" am:
4ce19f5c4f
am:
fde3c6d74a
Change-Id: Id20c96f550ecf7c05926eaea8a29575aeb8aaa07
Robin Lee [Thu, 19 Jan 2017 23:13:04 +0000 (23:13 +0000)]
Merge "Clear VPN after Clear credentials if VPN is being established"
am:
4ce19f5c4f
Change-Id: Ib35450b0c389da1bbba311c05d1d0346eb612b9e
Robin Lee [Thu, 19 Jan 2017 23:02:20 +0000 (23:02 +0000)]
Merge "Clear VPN after Clear credentials if VPN is being established"
Jack He [Tue, 1 Nov 2016 22:38:38 +0000 (15:38 -0700)]
Fix Bluetooth pairing dialogue crash
When pairing passkey is invalid, onCreate() should return early to
prevent any dialog from displaying, which will then call onDestroy()
to destroy the activity. However mReceiver should be registered before
onDestroy() is called as onDestroy() will call unregisterReceiver(mReceiver)
that will throw an IllegalArgumentException when mReceiver was not registered.
This fix adds a flag that tracks whether mReceiver has been registered.
In addition, this fix fails the passkey confirmation request upon invalid
passkey.
Bug:
32577328
Test: Test with PTS TC_SERVER_SA_BI_01_C
Change-Id: Ifc047bad6bd99abca04404af9cd54d2034cd35aa
(cherry picked from commit
6f8e9eda2d9ed830d47971d93327792906db2dc1)
Paul Duffin [Thu, 19 Jan 2017 15:22:55 +0000 (15:22 +0000)]
Merge "Prepare for removal of legacy-test from default targets" am:
a6b0c881fd am:
a3da659863
am:
cf967da02a
Change-Id: Ifc88129c31c074674f42ee356382dd6aa5022952
Paul Duffin [Thu, 19 Jan 2017 15:20:26 +0000 (15:20 +0000)]
Merge "Prepare for removal of legacy-test from default targets" am:
a6b0c881fd
am:
a3da659863
Change-Id: Id36b48a4a25aa564b5270ad16aa5a2eb1eadfadb
Paul Duffin [Thu, 19 Jan 2017 15:17:53 +0000 (15:17 +0000)]
Merge "Prepare for removal of legacy-test from default targets"
am:
a6b0c881fd
Change-Id: Iadb65fd5a2630e74071866f2d0b4347d29a71af1
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
Bill Yi [Thu, 19 Jan 2017 04:51:51 +0000 (04:51 +0000)]
Import translations. DO NOT MERGE
am:
0446865d68 -s ours
Change-Id: I389d6dd23abc7e3476d00a25ab958d1de44b7e09
Bill Yi [Thu, 19 Jan 2017 03:10:06 +0000 (19:10 -0800)]
Import translations. DO NOT MERGE
Change-Id: I610fb1c188fb93d6e2d70dd52da7dd766d27c209
Auto-generated-cl: translation import
Pavlin Radoslavov [Wed, 18 Jan 2017 20:41:29 +0000 (20:41 +0000)]
Merge "Update/cleanup Bluetooth Codec strings in Developer Settings" am:
b057b2da02 am:
058533ae25
am:
4dac712d7c
Change-Id: I0680026da45bb1828c70ec051e789b0845176702
Pavlin Radoslavov [Wed, 18 Jan 2017 20:29:44 +0000 (20:29 +0000)]
Merge "Update/cleanup Bluetooth Codec strings in Developer Settings" am:
b057b2da02
am:
058533ae25
Change-Id: I49b4565644c584a69897f4b642a1b308fe9df0f0
Pavlin Radoslavov [Wed, 18 Jan 2017 20:25:52 +0000 (20:25 +0000)]
Merge "Update/cleanup Bluetooth Codec strings in Developer Settings"
am:
b057b2da02
Change-Id: I892ea30d6fb15ba10859cd48788260e5ad8ad380
Tamas Berghammer [Wed, 18 Jan 2017 20:24:36 +0000 (20:24 +0000)]
DO NOT MERGE: Revert "Update package names to work with the proto3 compiler"
am:
5a638a6ad1
Change-Id: If23c0926eecf6a08ed0c0ab174cdddb43e31cc00
Treehugger Robot [Wed, 18 Jan 2017 20:20:47 +0000 (20:20 +0000)]
Merge "Update/cleanup Bluetooth Codec strings in Developer Settings"
Tamas Berghammer [Wed, 18 Jan 2017 16:20:00 +0000 (16:20 +0000)]
DO NOT MERGE: Revert "Update package names to work with the proto3 compiler"
This reverts commit
fbd5f5fdce07a6d77dd2c3309c7272bf33414396.
Change-Id: I769f7a0f509996ccc39fd1c628cad7e5ec1202bf
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
Tamas Berghammer [Wed, 18 Jan 2017 17:45:33 +0000 (17:45 +0000)]
Update package names to work with the proto3 compiler
am:
fbd5f5fdce
Change-Id: I20b3bc10cf66bb94369631cef229787b5e6353b6
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
Jaewoong Jung [Sat, 14 Jan 2017 06:05:56 +0000 (06:05 +0000)]
Implements additional battery info menu behavior.
am:
8a49de31ab
Change-Id: I29a2a6032b02309ae9e966f517774f5ce1451c3b
Jaewoong Jung [Tue, 20 Dec 2016 02:39:41 +0000 (18:39 -0800)]
Implements additional battery info menu behavior.
This is a manual cherry-pick of commit
6a43a06cac12494cd27e5b5cad4149a272d90038.
Bug:
33352540
Test: Updated existing tests.
Change-Id: I990029d2ea9032301362d614959259965b8ecb10
Jaewoong Jung [Fri, 13 Jan 2017 22:40:40 +0000 (22:40 +0000)]
Merge "Adds a menu item for additional battery info to battery settings." into nyc-mr2-dev
am:
bd775165d4
Change-Id: I3b5d1278bf2d2e237b9d0c7bd8349de451fc263b
Jaewoong Jung [Fri, 13 Jan 2017 22:40:38 +0000 (22:40 +0000)]
Adds a menu item for additional battery info to battery settings.
am:
7b557df0e4
Change-Id: Iaef847979f64bf93b87457fa3f2f734b1789c830
Jaewoong Jung [Fri, 13 Jan 2017 22:38:10 +0000 (22:38 +0000)]
Merge "Adds a menu item for additional battery info to battery settings." into nyc-mr2-dev
Jaewoong Jung [Tue, 13 Dec 2016 01:32:31 +0000 (17:32 -0800)]
Adds a menu item for additional battery info to battery settings.
This is a manual cherry-pick of commit
1e0f8ff5e549636e98b7fa0f12761be934f8f36b.
Bug:
33352540
Test: No additional test failures.
Change-Id: Ibfc1a9463c93d3c087ed712fe45d3d0717472c6a
Salvador Martinez [Fri, 13 Jan 2017 01:06:45 +0000 (01:06 +0000)]
Removed fake data
am:
4b69b113fb
Change-Id: Idc8731119c9dca50135c15454944d8b20aa89730
Salvador Martinez [Fri, 16 Dec 2016 00:13:38 +0000 (16:13 -0800)]
Removed fake data
Was using fake data for testing that we could attach
payloads. This is no longer needed since we are now
attaching real data.
Test: Manual Verification on GCS
Bug:
27823357
Change-Id: I055c2b2e027f721e14ea5b6b7efccd5267018b8c
Bill Yi [Thu, 12 Jan 2017 17:17:41 +0000 (17:17 +0000)]
Import translations. DO NOT MERGE
am:
39c04bb92b -s ours
Change-Id: I79582468959e2a04d6ea69a9faedaf28c67f1986
Bill Yi [Thu, 12 Jan 2017 14:02:43 +0000 (06:02 -0800)]
Import translations. DO NOT MERGE
Change-Id: I83e0e51b5552d44b66a84d5abdaac59ec3932c64
Auto-generated-cl: translation import
Salvador Martinez [Thu, 12 Jan 2017 02:07:21 +0000 (02:07 +0000)]
Added survey triggering mechanisms
am:
2cb82c55a0
Change-Id: Ib1a98fc3351059a7811c41f616507abec689a98a
Salvador Martinez [Thu, 8 Dec 2016 20:44:47 +0000 (12:44 -0800)]
Added survey triggering mechanisms
Surveys can now be triggered on a subset of Settings screens.
Surveys can also be modified/created for this subset of
screens remotely.
Test: RoboTests(master) && JUnitTests
Bug:
27823357
Change-Id: I1534af5573bef6f6c65c9c99b6f5a2917c3325b9
Salvador Martinez [Wed, 11 Jan 2017 19:41:26 +0000 (19:41 +0000)]
Added feature for surveys provider to Settings
am:
cd0fe608c5
Change-Id: I13ceb5009800cb25483d85220c0ec22051f79cbe
Salvador Martinez [Wed, 19 Oct 2016 19:51:45 +0000 (12:51 -0700)]
Added feature for surveys provider to Settings
It is now possible to create and show surveys to a user
asking them for feedback within the Settings app.
Test: In Master Branch
Bug:
27823357
Change-Id: I824899045f6ce30e5b6f46d20888da673114f658
Tamas Berghammer [Wed, 22 Jun 2016 14:34:45 +0000 (15:34 +0100)]
Update package names to work with the proto3 compiler
Bug: b/
28974522
Change-Id: I5f3adf4946ee4ba1e09e4f40afe83c151405972a
(cherry picked from commit
265d3c2a0c36251bf8a9f571d7239b6dd404d942)
Pavlin Radoslavov [Wed, 11 Jan 2017 06:27:09 +0000 (06:27 +0000)]
Merge "Moved the Bluetooth-related default config init within onCreate()" am:
ab9e269d06 am:
6e154cfb98
am:
216dcdc9dc
Change-Id: I53981066dfc5975aa4bd02b2d5004d286bb7dc63
Pavlin Radoslavov [Wed, 11 Jan 2017 06:21:10 +0000 (06:21 +0000)]
Merge "Moved the Bluetooth-related default config init within onCreate()" am:
ab9e269d06
am:
6e154cfb98
Change-Id: I985957eb0322dc13571705f9cc8d5abe65a931bb
Pavlin Radoslavov [Wed, 11 Jan 2017 06:15:39 +0000 (06:15 +0000)]
Merge "Moved the Bluetooth-related default config init within onCreate()"
am:
ab9e269d06
Change-Id: Ic0d0d4b6d63b25afafae35b81686e746939646fd
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
Yanhong Shen [Tue, 10 Jan 2017 21:33:49 +0000 (21:33 +0000)]
Merge "Some Wi-Fi Menus like WPS should be disabled when Wi-Fi is off" am:
f952a87060 am:
a9e9bf20e8
am:
8b1f115942
Change-Id: I67215050e9663e7bf84ec78c31d97e6b0291ae19
Yanhong Shen [Tue, 10 Jan 2017 21:28:47 +0000 (21:28 +0000)]
Merge "Some Wi-Fi Menus like WPS should be disabled when Wi-Fi is off" am:
f952a87060
am:
a9e9bf20e8
Change-Id: Ia45623e60a3a774b3b21dd58d350f3c408aaff20
Yanhong Shen [Tue, 10 Jan 2017 21:24:19 +0000 (21:24 +0000)]
Merge "Some Wi-Fi Menus like WPS should be disabled when Wi-Fi is off"
am:
f952a87060
Change-Id: I0da164fbdbb04e54be2a26df85b8fcc1f58192e5
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"
Geoffrey Pitsch [Tue, 10 Jan 2017 19:12:26 +0000 (19:12 +0000)]
Merge "DO NOT MERGE Fix Notification Settings when unblockable app is blocked." into nyc-mr2-dev
am:
6688dae166
Change-Id: Ib8004c18bcc9db33c2340f89fc93268e41026c4d
Geoffrey Pitsch [Tue, 10 Jan 2017 19:12:25 +0000 (19:12 +0000)]
DO NOT MERGE Fix Notification Settings when unblockable app is blocked.
am:
db380fa9cb
Change-Id: I248be6a106a5dc20b5e391b2aebc267786a97e65
Geoffrey Pitsch [Tue, 10 Jan 2017 19:06:00 +0000 (19:06 +0000)]
Merge "DO NOT MERGE Fix Notification Settings when unblockable app is blocked." into nyc-mr2-dev
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
Bill Yi [Tue, 10 Jan 2017 07:27:47 +0000 (07:27 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
am:
adce1145a9 -s ours
Change-Id: I7d6248afd47be986586f45a98b23a932d8457c2b
Bill Yi [Tue, 10 Jan 2017 07:27:45 +0000 (07:27 +0000)]
Import translations. DO NOT MERGE
am:
5d8d883ab1 -s ours
Change-Id: I6227215a415906f4f6ba04e9d7edc0a587dafb3c
TreeHugger Robot [Tue, 10 Jan 2017 07:18:41 +0000 (07:18 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
pkanwar [Tue, 10 Jan 2017 00:58:24 +0000 (00:58 +0000)]
DO NOT MERGE: Fix NPE in ConfigureWifiSettings.
am:
ef2b35ad59 -s ours
Change-Id: I512a3b568246c2693a335c63a22e88d6d4b3edbe
Bill Yi [Mon, 9 Jan 2017 21:14:43 +0000 (13:14 -0800)]
Import translations. DO NOT MERGE
Change-Id: Iba9f6f945f3e421f8413967b392e04085561c7c3
Auto-generated-cl: translation import
pkanwar [Mon, 9 Jan 2017 20:21:22 +0000 (12:21 -0800)]
DO NOT MERGE: Fix NPE in ConfigureWifiSettings.
NPE was introduced as part of recent changes for Carrier Wifi networks.
This CL adds a null check.
Bug:
34050661
Change-Id: I585f6499b1ca06d9bd25ad3449f035c5a616a140
Pavlin Radoslavov [Sat, 7 Jan 2017 01:36:55 +0000 (01:36 +0000)]
Merge "Add Bluetooth Codec selection UI to the Developer Options" am:
bb08073b6f am:
0115cc702a
am:
cc7a8d0b2c
Change-Id: Ieafda5fcbaa1252f34e06345f6f2bc0a509e4d68
Pavlin Radoslavov [Sat, 7 Jan 2017 01:28:45 +0000 (01:28 +0000)]
Merge "Add Bluetooth Codec selection UI to the Developer Options" am:
bb08073b6f
am:
0115cc702a
Change-Id: I8d2e73d3c91ac18005f8e6f74e39c81e84ad41c3
Pavlin Radoslavov [Sat, 7 Jan 2017 01:24:43 +0000 (01:24 +0000)]
Merge "Add Bluetooth Codec selection UI to the Developer Options"
am:
bb08073b6f
Change-Id: I1586182f52b726a56c92d2ed35e1e6dd6eff237e
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
Ruchi Kandoi [Thu, 5 Jan 2017 18:14:58 +0000 (18:14 +0000)]
Merge "Update Android Beam feature summary string" am:
27a59e1d2c am:
abe9a41d19
am:
662975d861
Change-Id: I6bad7c49519869dd60e130e5a31cf3514b0896c1
Ruchi Kandoi [Thu, 5 Jan 2017 18:11:54 +0000 (18:11 +0000)]
Merge "Update Android Beam feature summary string" am:
27a59e1d2c
am:
abe9a41d19
Change-Id: I0a2cf7b82818102adc857cd38007a6e3ba7b4dd9
Ruchi Kandoi [Thu, 5 Jan 2017 18:08:22 +0000 (18:08 +0000)]
Merge "Update Android Beam feature summary string"
am:
27a59e1d2c
Change-Id: I6edef06c6e0c94dc8c5d27003f19b60b2f6c5f4c
Treehugger Robot [Thu, 5 Jan 2017 18:04:12 +0000 (18:04 +0000)]
Merge "Update Android Beam feature summary string"
Bill Yi [Thu, 5 Jan 2017 10:16:47 +0000 (10:16 +0000)]
Import translations. DO NOT MERGE
am:
cd3475f3d1 -s ours
Change-Id: I56384f858944a1607cadd5cea8f95a0e346b8a50
Bill Yi [Thu, 5 Jan 2017 01:46:43 +0000 (17:46 -0800)]
Import translations. DO NOT MERGE
Change-Id: I24410f77a5b2f4777bae8546e6709c47d971c992
Auto-generated-cl: translation import
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>
Bill Yi [Fri, 30 Dec 2016 10:50:02 +0000 (10:50 +0000)]
Import translations. DO NOT MERGE
am:
0be5ccb7cd -s ours
Change-Id: I140febe4d647261616e2e3a186addac58a7a7064
Bill Yi [Fri, 30 Dec 2016 08:59:18 +0000 (00:59 -0800)]
Import translations. DO NOT MERGE
Change-Id: Id7a36307bc781734e2647f01af6b07b5ed3a600a
Auto-generated-cl: translation import
Geoffrey Pitsch [Wed, 28 Dec 2016 17:29:40 +0000 (12:29 -0500)]
DO NOT MERGE Fix Notification Settings when unblockable app is blocked.
When an app was blocked in the past, don't hide the controls
so the user is able to unblock the app. After unblocking, the
controls will be hidden the next time settings is visited.
Bug:
32557897
Change-Id: I7ab17f647b197162932b131c41bb18cf5c18917d
gaochong [Wed, 28 Dec 2016 19:03:46 +0000 (19:03 +0000)]
Merge "Handle SubSettings instance leaks in Index.java" am:
527b2b220a am:
bf4a67ec0f
am:
28688c3ba3
Change-Id: I31cd7f083c529342ac2b07f054d82b4a9191937b
gaochong [Wed, 28 Dec 2016 18:55:47 +0000 (18:55 +0000)]
Merge "Handle SubSettings instance leaks in Index.java" am:
527b2b220a
am:
bf4a67ec0f
Change-Id: I89d30398cfe13e72ccbcbb92d5d4e0eda5f350ae
gaochong [Wed, 28 Dec 2016 18:48:16 +0000 (18:48 +0000)]
Merge "Handle SubSettings instance leaks in Index.java"
am:
527b2b220a
Change-Id: Iccfeef38ca133bb63708b9f6ce90c457aadf62f6
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:45:23 +0000 (10:45 +0000)]
Merge "Update VPN preference state after disallow configuring VPN policy has changed." am:
601d339868 am:
4395176792
am:
7779d9ee91
Change-Id: I7d7b4c181ba94d662f4d1946513fdaf6bdb6e9dd
Robin Lee [Fri, 23 Dec 2016 10:39:24 +0000 (10:39 +0000)]
Merge "Update VPN preference state after disallow configuring VPN policy has changed." am:
601d339868
am:
4395176792
Change-Id: Ie71a58c50fde7c5ecc4f80dfe5eb854428044480
Robin Lee [Fri, 23 Dec 2016 10:33:22 +0000 (10:33 +0000)]
Merge "Update VPN preference state after disallow configuring VPN policy has changed."
am:
601d339868
Change-Id: I94666d5f7812b15432b44ed50d8d396b373d3e69
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."
Nathan Harold [Fri, 23 Dec 2016 01:19:55 +0000 (01:19 +0000)]
Merge "Always include BAND_MODE=AUTOMATIC in the Radio Band Mode List" into nyc-mr2-dev
am:
94dee56f8d
Change-Id: I001ddbd12794ce1cb09826cf07c7d1993adf5c65
Nathan Harold [Fri, 23 Dec 2016 01:19:54 +0000 (01:19 +0000)]
Always include BAND_MODE=AUTOMATIC in the Radio Band Mode List
am:
d18b9fcde0
Change-Id: I37594a773398fea40a4aeb1a7611bf424624f075
Nathan Harold [Fri, 23 Dec 2016 01:11:39 +0000 (01:11 +0000)]
Merge "Always include BAND_MODE=AUTOMATIC in the Radio Band Mode List" into nyc-mr2-dev
Pankaj Kanwar [Thu, 22 Dec 2016 20:57:57 +0000 (20:57 +0000)]
Merge "DO NOT MERGE: Add UI toggle to control connections to carrier networks." into nyc-mr2-dev
am:
642e48e527
Change-Id: I70ce7b3276eeb2be9f79b427a72d6fdb66e0ff74
pkanwar [Thu, 22 Dec 2016 20:54:05 +0000 (20:54 +0000)]
DO NOT MERGE: Add UI toggle to control connections to carrier networks.
am:
675122ad51 -s ours
Change-Id: I3a78730b1af0d4e6eaa221cc0ccfbf28daeb57a6
Pankaj Kanwar [Thu, 22 Dec 2016 20:41:54 +0000 (20:41 +0000)]
Merge "DO NOT MERGE: Add UI toggle to control connections to carrier networks." into nyc-mr2-dev
pkanwar [Sun, 11 Dec 2016 23:36:34 +0000 (15:36 -0800)]
DO NOT MERGE: Add UI toggle to control connections to carrier networks.
Bug:
31003437
Change-Id: Ieb6dfc0dc989068e151a1d0e376f56f67c9790b2
Bill Yi [Thu, 22 Dec 2016 07:57:23 +0000 (07:57 +0000)]
Import translations. DO NOT MERGE
am:
54e5382136 -s ours
Change-Id: Ie55ae75412f7a8e89763679c2e179d1bae2c7619
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
OSDN Git Service
