Philip P. Moltmann
40046d4316
Merge "[DO NOT MERGE] Use new QueuedWork interface." into nyc-mr2-dev
...
am: 47c8abaa67
2017-02-02 19:34:48 +00:00
Alexey Polyudov
5d409ace19
resolve merge conflicts of 81758edffa to nyc-mr2-dev-plus-aosp
...
Change-Id: Ie5f768b3986b1a2847503ed0871dc1dc79007d88
2017-02-02 11:11:29 -08:00
Pavlin Radoslavov
068780c052
Merge "Add missing null pointer check for Bluetooth A2DP Codec Settings" am: 78115c0abc am: 0356b740f2
...
am: 33b4688634
2017-02-02 04:38:17 +00:00
Pavlin Radoslavov
33b4688634
Merge "Add missing null pointer check for Bluetooth A2DP Codec Settings" am: 78115c0abc
...
am: 0356b740f2
2017-02-02 04:35:49 +00:00
Pavlin Radoslavov
0356b740f2
Merge "Add missing null pointer check for Bluetooth A2DP Codec Settings"
...
am: 78115c0abc
2017-02-02 04:32:48 +00:00
Treehugger Robot
78115c0abc
Merge "Add missing null pointer check for Bluetooth A2DP Codec Settings"
2017-02-02 04:29:16 +00:00
Pavlin Radoslavov
789d21d475
Add missing null pointer check for Bluetooth A2DP Codec Settings
...
Bug: 34885602
Test: Code compilation
Change-Id: I13443390e7c6ffa34b5957a588fc0cefdf5b80f5
2017-02-01 17:43:23 -08:00
TreeHugger Robot
47c8abaa67
Merge "[DO NOT MERGE] Use new QueuedWork interface." into nyc-mr2-dev
2017-02-01 23:08:54 +00:00
Christine Franks
91bd9f3072
DO NOT MERGE - Require password to FR in carrier demo mode
...
am: 22430d5abb
2017-02-01 19:14:41 +00:00
Christine Franks
22430d5abb
DO NOT MERGE - Require password to FR in carrier demo mode
...
Bug: 34341567
Test: manual - password is not required for regular user factory
resets and is required in carrier demo mode.
Change-Id: Icadb6edb3d85ae58b45862c182b6b03bf2c3ce16
2017-02-01 09:37:28 -08:00
Christine Franks
ff43d8f3b7
DO NOT MERGE - Allow FR in carrier demo mode
...
am: bb6859ca75
2017-02-01 02:16:17 +00:00
Christine Franks
bb6859ca75
DO NOT MERGE - Allow FR in carrier demo mode
...
Bug: 34341567
Test: manual - in carrier demo mode, go to Settings > Backup and
Reset > Factory data reset > Reset phone > Erase everything and
this entire path is viewable.
Change-Id: I373a2e94f205f6e6e4dd9a54dcf08532a64e5187
2017-02-01 00:37:45 +00:00
Marie Janssen
43e2d0a759
Merge "Bluetooth: remove unused SINK_STATE_CHANGED action" am: fb0ab547c2 am: e10af2add7
...
am: 5741187f31
2017-01-31 19:24:12 +00:00
Pavlin Radoslavov
502de2cfa2
Merge "Update the A2DP Codec Config API" am: bd298a7a50 am: 96dda78d24
...
am: 6fbaebd7e8
2017-01-31 19:18:46 +00:00
Marie Janssen
5741187f31
Merge "Bluetooth: remove unused SINK_STATE_CHANGED action" am: fb0ab547c2
...
am: e10af2add7
2017-01-31 19:16:35 +00:00
Marie Janssen
e10af2add7
Merge "Bluetooth: remove unused SINK_STATE_CHANGED action"
...
am: fb0ab547c2
2017-01-31 19:14:47 +00:00
Pavlin Radoslavov
6fbaebd7e8
Merge "Update the A2DP Codec Config API" am: bd298a7a50
...
am: 96dda78d24
2017-01-31 19:13:20 +00:00
Marie Janssen
fb0ab547c2
Merge "Bluetooth: remove unused SINK_STATE_CHANGED action"
2017-01-31 19:09:34 +00:00
Pavlin Radoslavov
96dda78d24
Merge "Update the A2DP Codec Config API"
...
am: bd298a7a50
2017-01-31 19:08:11 +00:00
Pavlin Radoslavov
bd298a7a50
Merge "Update the A2DP Codec Config API"
2017-01-31 19:02:36 +00:00
Bill Yi
bb2a8f15cb
Import translations. DO NOT MERGE
...
am: 2a3b062c4a
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
Philip P. Moltmann
81758edffa
[DO NOT MERGE] Use new QueuedWork interface.
...
Test: Ran SharedPreferences CTS tests
Bug: 33385963
Bug: 30662828
Change-Id: I8025a087b43462324d0d45555094cbb54a671404
(cherry picked from commit 231c9fbfa6
2017-01-31 02:51:04 +00:00
Pavlin Radoslavov
2829ca322a
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
2017-01-30 16:22:24 -08:00
Marie Janssen
eb6c51543d
Bluetooth: remove unused SINK_STATE_CHANGED action
...
android.bluetooth.a2dp.action.SINK_STATE_CHANGED is unused.
Test: compiles
Bug: 34395439
Change-Id: I5c347886fdf9dbdf15feb82f2a9622dd22f010b6
2017-01-30 19:29:54 +00:00
Marie Janssen
1c98d85cf6
Merge "Bluetooth: remove BluetoothDiscoveryReceiver" am: 1ad23a71e4 am: 184506a710
...
am: 83fb10ae1e
2017-01-30 18:02:01 +00:00
Marie Janssen
83fb10ae1e
Merge "Bluetooth: remove BluetoothDiscoveryReceiver" am: 1ad23a71e4
...
am: 184506a710
2017-01-30 17:57:11 +00:00
Marie Janssen
184506a710
Merge "Bluetooth: remove BluetoothDiscoveryReceiver"
...
am: 1ad23a71e4
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
2017-01-27 20:34:41 +00:00
Salvador Martinez
a7b1c967b7
Remove fake data
...
am: a1499c3005
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
2017-01-27 20:03:12 +00:00
Salvador Martinez
e2904eb7fa
Fix null pointer exception when surveys are turned off
...
am: 9db3cb3bee
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
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
