Commit Graph

30173 Commits

Author SHA1 Message Date
Bill Yi
bb2a8f15cb Import translations. DO NOT MERGE
am: 2a3b062c4a  -s ours

Change-Id: Ic11826d8d728ca3324bd0bc75455ccf6fe7c3008
2017-01-31 08:42:59 +00:00
Bill Yi
2a3b062c4a Import translations. DO NOT MERGE
Change-Id: I2852cdf90dd08680bd6e7af3c8dffec5b60a4fe4
Auto-generated-cl: translation import
2017-01-30 23:10:41 -08:00
Marie Janssen
1c98d85cf6 Merge "Bluetooth: remove BluetoothDiscoveryReceiver" am: 1ad23a71e4 am: 184506a710
am: 83fb10ae1e

Change-Id: Ib7a51c9cae91202087bfcc11e6eb18b219e84d36
2017-01-30 18:02:01 +00:00
Marie Janssen
83fb10ae1e Merge "Bluetooth: remove BluetoothDiscoveryReceiver" am: 1ad23a71e4
am: 184506a710

Change-Id: I6114e7b4617e7f23373434a54672497654d6d786
2017-01-30 17:57:11 +00:00
Marie Janssen
184506a710 Merge "Bluetooth: remove BluetoothDiscoveryReceiver"
am: 1ad23a71e4

Change-Id: I045b82e81d1fdd3d8844efbd2c79d41fdd6d8aa6
2017-01-30 17:51:50 +00:00
Marie Janssen
1ad23a71e4 Merge "Bluetooth: remove BluetoothDiscoveryReceiver" 2017-01-30 17:46:17 +00:00
Salvador Martinez
14db171c1b Merge "Remove fake data" into nyc-mr2-dev
am: d258b2f40f  -s ours

Change-Id: Ic418e0cbdd54679f0af152b13f52f34d963da8b6
2017-01-27 20:34:41 +00:00
Salvador Martinez
a7b1c967b7 Remove fake data
am: a1499c3005  -s ours

Change-Id: Iea66d48fba72ff28bbc81a1499084a9afcd1e569
2017-01-27 20:34:39 +00:00
TreeHugger Robot
d258b2f40f Merge "Remove fake data" into nyc-mr2-dev 2017-01-27 20:31:40 +00:00
Salvador Martinez
387fdd058e Merge "Fix null pointer exception when surveys are turned off" into nyc-mr2-dev
am: 4edcb927ab

Change-Id: I384020dab83593e815c0afc0d5c2657c9dcaacbc
2017-01-27 20:03:12 +00:00
Salvador Martinez
e2904eb7fa Fix null pointer exception when surveys are turned off
am: 9db3cb3bee

Change-Id: I9f71f40a715cfb65d8a5bc53fed64e674bd0515d
2017-01-27 20:03:08 +00:00
TreeHugger Robot
4edcb927ab Merge "Fix null pointer exception when surveys are turned off" into nyc-mr2-dev 2017-01-27 19:59:03 +00:00
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

Change-Id: I2db7aa3136facd9841c52e6c79e38fd140b41df1
2017-01-27 03:41:44 +00:00
Andrew Sapperstein
251c91d974 Finalize string for usage alerts.
am: 59fd24cde2

Change-Id: I79519e4c1f04dd2eee32320b4d8c4482fd4f2830
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

Change-Id: I69b7cef21d953bcecd2fb73ddbc1b6231c4eb25b
2017-01-26 19:31:19 +00:00
Pavlin Radoslavov
e3fc5f7b56 Merge "Integration of the AAC codec for A2DP source" am: 6a153ac4aa
am: a53cc5068d

Change-Id: Iee8bf4a93a7c6879a144616648fd629c3109e40d
2017-01-26 19:25:49 +00:00
Pavlin Radoslavov
a53cc5068d Merge "Integration of the AAC codec for A2DP source"
am: 6a153ac4aa

Change-Id: I1ca21a7c2a2c2792ba3fa6055f767d3b8686f5d5
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

Change-Id: I9f5c2efb755e6e96805be3feb97f85dc0f4a0ce0
2017-01-26 10:36:06 +00:00
Stefanot
3c019a8714 *DO NOT MERGE* Create new suggestion category for backup.
am: 1c72ce06d1

Change-Id: I07d65c9045c97ac62e4d7bfc0fd96a92fdab5809
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

Change-Id: I7bb618cdbe0bc925b214b9184652864ad6b5a8ba
2017-01-26 10:06:43 +00:00
Steven Moreland
ec0e1fb59f Merge "Development Options: toggle binderized hals" am: 5f854f39a8
am: 8076dcde0c

Change-Id: Idb3f71707b7b1b091e3a18517852fff66e01cf08
2017-01-26 10:03:46 +00:00
Steven Moreland
8076dcde0c Merge "Development Options: toggle binderized hals"
am: 5f854f39a8

Change-Id: Id05768135b0609e917f4e1888caf2724ebf9ba3a
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  -s ours

Change-Id: I5ab2b1d1e9767e94d0aea73c51d3bc12f151184a
2017-01-26 07:11:30 +00:00
Bill Yi
b33b8c9081 Import translations. DO NOT MERGE
am: db68fc320f  -s ours

Change-Id: I178cf3af6e91249aed1ed457bcbc88eb2d7f86f1
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

Change-Id: Idd44b8b05758f3fd8c2e016604c0f2a10bd0b80c
2017-01-25 21:33:23 +00:00
Jerry Zhang
a0b75ff516 Refactor setCurrentFunction and setUsbDataUnlocked into one method
am: a291336bd8  -s ours

Change-Id: I60a407b71c4fbf4b5bd0ef980c08af8a4aa68f20
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

Change-Id: Ida107059b3a5ec815f198659ff8174c8ff375efe
2017-01-25 16:10:29 +00:00
Marie Janssen
60eb5503e8 Merge "Make headset icons consistent before / after pairing" am: 690bdb22c9
am: a2e068a2b4

Change-Id: I036781f8908da81ea294abafaf6c72e9d03699c8
2017-01-25 16:08:01 +00:00
Marie Janssen
a2e068a2b4 Merge "Make headset icons consistent before / after pairing"
am: 690bdb22c9

Change-Id: I64a9a3a7d8a2f110ee1809af33583f82fc4b4f57
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

Change-Id: Ia13886f7e3214e355db017b4463a956c0971b021
2017-01-21 19:50:24 +00:00
Stefanot
eecfc2c5f7 Add SuggestionFeatureProvider interface.
am: 2eac39b393

Change-Id: I87fae019229983b97c19710b6cf73f4e1d05dff1
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