Salvador Martinez
a1499c3005
Remove fake data
...
Missed one location that adds fake data
to the payload the first time these were
removed. This patch removes any remaining
fake data being attached to a survey payload.
Test: Robotests still pass
Bug: 34716378
Change-Id: Iccb60ce24ae5c494dcd287107f8d293f4a56b2d5
Merged-In: I055c2b2e027f721e14ea5b6b7efccd5267018b8c
2017-01-27 10:47:33 -08:00
Salvador Martinez
9db3cb3bee
Fix null pointer exception when surveys are turned off
...
In some conditions the survey provider could be null on
download completion which could lead to a NPE. This
has been addressed by not requiring an instance for
the removal of the receiver.
Test: RunSettingsRoboTests (master)
Bug: 33707203
Change-Id: Id1ab1a24c697fed8e4dd259682a088b50c35f38a
Merged-In: Icfb545697f24172db734dd7dad421796edf68186
2017-01-27 10:29:10 -08:00
Andrew Sapperstein
718de5da30
Merge "Finalize string for usage alerts." into nyc-mr2-dev
...
am: f15b23ad65
2017-01-27 03:41:44 +00:00
Andrew Sapperstein
251c91d974
Finalize string for usage alerts.
...
am: 59fd24cde2
2017-01-27 03:39:48 +00:00
TreeHugger Robot
f15b23ad65
Merge "Finalize string for usage alerts." into nyc-mr2-dev
2017-01-27 03:37:45 +00:00
Andrew Sapperstein
59fd24cde2
Finalize string for usage alerts.
...
Test: manual
Bug: 34200177
Change-Id: I5c28b2844b035d551ef2707b9797443074d0d23f
2017-01-26 17:30:30 -08:00
Marie Janssen
683528db8b
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
2017-01-26 15:38:05 -08:00
Pavlin Radoslavov
fbdc22ff9a
Merge "Integration of the AAC codec for A2DP source" am: 6a153ac4aa am: a53cc5068d
...
am: e3fc5f7b56
2017-01-26 19:31:19 +00:00
Pavlin Radoslavov
e3fc5f7b56
Merge "Integration of the AAC codec for A2DP source" am: 6a153ac4aa
...
am: a53cc5068d
2017-01-26 19:25:49 +00:00
Pavlin Radoslavov
a53cc5068d
Merge "Integration of the AAC codec for A2DP source"
...
am: 6a153ac4aa
2017-01-26 19:20:20 +00:00
Treehugger Robot
6a153ac4aa
Merge "Integration of the AAC codec for A2DP source"
2017-01-26 19:12:55 +00:00
Pavlin Radoslavov
c0a3a9fb94
Integration of the AAC codec for A2DP source
...
Test: A2DP streaming to AAC headsets
Bug: 30958229
Change-Id: Icef9ce9fb8e41cad65bc57bf078513d0c7bf7b9a
2017-01-26 09:30:11 -08:00
Stefano Tommasini
3e7287b6db
Merge "*DO NOT MERGE* Create new suggestion category for backup." into nyc-mr2-dev
...
am: a04697a951
2017-01-26 10:36:06 +00:00
Stefanot
3c019a8714
*DO NOT MERGE* Create new suggestion category for backup.
...
am: 1c72ce06d1
2017-01-26 10:35:45 +00:00
Stefano Tommasini
a04697a951
Merge "*DO NOT MERGE* Create new suggestion category for backup." into nyc-mr2-dev
2017-01-26 10:31:15 +00:00
Steven Moreland
7ea5b6d740
Merge "Development Options: toggle binderized hals" am: 5f854f39a8 am: 8076dcde0c
...
am: ec0e1fb59f
2017-01-26 10:06:43 +00:00
Steven Moreland
ec0e1fb59f
Merge "Development Options: toggle binderized hals" am: 5f854f39a8
...
am: 8076dcde0c
2017-01-26 10:03:46 +00:00
Steven Moreland
8076dcde0c
Merge "Development Options: toggle binderized hals"
...
am: 5f854f39a8
2017-01-26 10:01:15 +00:00
Treehugger Robot
5f854f39a8
Merge "Development Options: toggle binderized hals"
2017-01-26 09:57:39 +00:00
Bill Yi
398db3e566
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
...
am: 063b543124
2017-01-26 07:11:30 +00:00
Bill Yi
b33b8c9081
Import translations. DO NOT MERGE
...
am: db68fc320f
2017-01-26 07:11:29 +00:00
TreeHugger Robot
063b543124
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
2017-01-26 07:06:17 +00:00
Steven Moreland
73dd0ae30e
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
2017-01-25 22:03:45 -08:00
Bill Yi
db68fc320f
Import translations. DO NOT MERGE
...
Change-Id: Ibb3ccac189513a5a988ec8c857f2ad574371808a
Auto-generated-cl: translation import
2017-01-25 20:04:52 -08:00
Jerry Zhang
8b6614cdc3
Merge "Refactor setCurrentFunction and setUsbDataUnlocked into one method" into nyc-mr2-dev
...
am: 361a3e2090
2017-01-25 21:33:23 +00:00
Jerry Zhang
a0b75ff516
Refactor setCurrentFunction and setUsbDataUnlocked into one method
...
am: a291336bd8
2017-01-25 21:24:02 +00:00
Jerry Zhang
361a3e2090
Merge "Refactor setCurrentFunction and setUsbDataUnlocked into one method" into nyc-mr2-dev
2017-01-25 20:30:18 +00:00
Stefanot
1c72ce06d1
*DO NOT MERGE* Create new suggestion category for backup.
...
Test: manual
BUG: 34219298
Change-Id: I288d36b2b48582e5f8e0d1720d1f7004ad8dae2c
2017-01-25 19:18:08 +00:00
Marie Janssen
a78e718b26
Merge "Make headset icons consistent before / after pairing" am: 690bdb22c9 am: a2e068a2b4
...
am: 60eb5503e8
2017-01-25 16:10:29 +00:00
Marie Janssen
60eb5503e8
Merge "Make headset icons consistent before / after pairing" am: 690bdb22c9
...
am: a2e068a2b4
2017-01-25 16:08:01 +00:00
Marie Janssen
a2e068a2b4
Merge "Make headset icons consistent before / after pairing"
...
am: 690bdb22c9
2017-01-25 16:06:00 +00:00
Marie Janssen
690bdb22c9
Merge "Make headset icons consistent before / after pairing"
2017-01-25 16:02:14 +00:00
Jerry Zhang
a291336bd8
Refactor setCurrentFunction and setUsbDataUnlocked into one method
...
This allows us to get rid of an extraneous config switch and
simplify some code.
Bug: 31814300
Test: Manually change usb configuration
Change-Id: Id78da530ff485ecd7a915056832eec1dd8c91954
(cherry picked from commit 5d36a177d9
2017-01-24 13:27:14 -08:00
Xiaodong Xu
262f7fba9a
Make headset icons consistent before / after pairing
...
Previously A2DP would be shown before pairing with a HFP device.
bug: 30677445
Change-Id: I0e9ab17197e6ee099d890d5368def36a14ca8344
2017-01-23 17:25:27 +00:00
Stefano Tommasini
698862f60d
Merge "Add SuggestionFeatureProvider interface." into nyc-mr2-dev
...
am: bd16255ee1
2017-01-21 19:50:24 +00:00
Stefanot
eecfc2c5f7
Add SuggestionFeatureProvider interface.
...
am: 2eac39b393
2017-01-21 19:50:22 +00:00
Stefano Tommasini
bd16255ee1
Merge "Add SuggestionFeatureProvider interface." into nyc-mr2-dev
2017-01-21 19:44:16 +00:00
Stefanot
2eac39b393
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
2017-01-21 14:34:04 +00:00
Bill Yi
f8a7c81d66
Import translations. DO NOT MERGE
...
am: 2c570117a8
2017-01-21 01:21:06 +00:00
Bill Yi
2c570117a8
Import translations. DO NOT MERGE
...
Change-Id: I6aed674efc270223bddfd6fbdae50a98ae695276
Auto-generated-cl: translation import
2017-01-20 12:31:51 -08:00
Jack He
244ebc1e31
Fix Bluetooth pairing dialogue crash
...
am: e51972868c
2017-01-19 23:45:28 +00:00
Robin Lee
cb1968148a
Merge "Clear VPN after Clear credentials if VPN is being established" am: 4ce19f5c4f am: fde3c6d74a
...
am: 185275e0ad
2017-01-19 23:31:21 +00:00
Robin Lee
185275e0ad
Merge "Clear VPN after Clear credentials if VPN is being established" am: 4ce19f5c4f
...
am: fde3c6d74a
2017-01-19 23:23:37 +00:00
Robin Lee
fde3c6d74a
Merge "Clear VPN after Clear credentials if VPN is being established"
...
am: 4ce19f5c4f
2017-01-19 23:13:04 +00:00
Robin Lee
4ce19f5c4f
Merge "Clear VPN after Clear credentials if VPN is being established"
2017-01-19 23:02:21 +00:00
Jack He
e51972868c
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)
2017-01-19 22:39:17 +00:00
Paul Duffin
61316803f2
Merge "Prepare for removal of legacy-test from default targets" am: a6b0c881fd am: a3da659863
...
am: cf967da02a
2017-01-19 15:22:55 +00:00
Paul Duffin
cf967da02a
Merge "Prepare for removal of legacy-test from default targets" am: a6b0c881fd
...
am: a3da659863
2017-01-19 15:20:26 +00:00
Paul Duffin
a3da659863
Merge "Prepare for removal of legacy-test from default targets"
...
am: a6b0c881fd
2017-01-19 15:17:53 +00:00
Treehugger Robot
a6b0c881fd
Merge "Prepare for removal of legacy-test from default targets"
2017-01-19 15:13:15 +00:00
