Commit Graph

13555 Commits

Author SHA1 Message Date
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
Pavlin Radoslavov
502de2cfa2 Merge "Update the A2DP Codec Config API" am: bd298a7a50 am: 96dda78d24
am: 6fbaebd7e8

Change-Id: I677b6fdc1280337c5b383aa0e681cba44db23c94
2017-01-31 19:18:46 +00:00
Pavlin Radoslavov
6fbaebd7e8 Merge "Update the A2DP Codec Config API" am: bd298a7a50
am: 96dda78d24

Change-Id: I2cdd1e9117076b17fcf218e8f50a86d9c36b3474
2017-01-31 19:13:20 +00:00
Pavlin Radoslavov
96dda78d24 Merge "Update the A2DP Codec Config API"
am: bd298a7a50

Change-Id: I5d3e3c0d3d6e3d679ad94779600a9e266f7f927b
2017-01-31 19:08:11 +00: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
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
TreeHugger Robot
d258b2f40f Merge "Remove fake data" into nyc-mr2-dev 2017-01-27 20:31:40 +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
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
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
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
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
Jerry Zhang
361a3e2090 Merge "Refactor setCurrentFunction and setUsbDataUnlocked into one method" into nyc-mr2-dev 2017-01-25 20:30:18 +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
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
Stefanot
eecfc2c5f7 Add SuggestionFeatureProvider interface.
am: 2eac39b393

Change-Id: I87fae019229983b97c19710b6cf73f4e1d05dff1
2017-01-21 19:50:22 +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
Jack He
244ebc1e31 Fix Bluetooth pairing dialogue crash
am: e51972868c

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

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

Change-Id: Id20c96f550ecf7c05926eaea8a29575aeb8aaa07
2017-01-19 23:23:37 +00:00
Robin Lee
fde3c6d74a Merge "Clear VPN after Clear credentials if VPN is being established"
am: 4ce19f5c4f

Change-Id: Ib35450b0c389da1bbba311c05d1d0346eb612b9e
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
Pavlin Radoslavov
4d70b69d7a Merge "Update/cleanup Bluetooth Codec strings in Developer Settings" am: b057b2da02 am: 058533ae25
am: 4dac712d7c

Change-Id: I0680026da45bb1828c70ec051e789b0845176702
2017-01-18 20:41:29 +00:00
Pavlin Radoslavov
4dac712d7c Merge "Update/cleanup Bluetooth Codec strings in Developer Settings" am: b057b2da02
am: 058533ae25

Change-Id: I49b4565644c584a69897f4b642a1b308fe9df0f0
2017-01-18 20:29:44 +00:00
Pavlin Radoslavov
058533ae25 Merge "Update/cleanup Bluetooth Codec strings in Developer Settings"
am: b057b2da02

Change-Id: I892ea30d6fb15ba10859cd48788260e5ad8ad380
2017-01-18 20:25:52 +00:00
Tamas Berghammer
6031fba9f2 DO NOT MERGE: Revert "Update package names to work with the proto3 compiler"
am: 5a638a6ad1

Change-Id: If23c0926eecf6a08ed0c0ab174cdddb43e31cc00
2017-01-18 20:24:36 +00:00
Tamas Berghammer
5a638a6ad1 DO NOT MERGE: Revert "Update package names to work with the proto3 compiler"
This reverts commit fbd5f5fdce.

Change-Id: I769f7a0f509996ccc39fd1c628cad7e5ec1202bf
2017-01-18 19:28:11 +00:00
Pavlin Radoslavov
dd39c073d6 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
2017-01-18 10:35:35 -08:00
Tamas Berghammer
6cd7e52b9e Update package names to work with the proto3 compiler
am: fbd5f5fdce

Change-Id: I20b3bc10cf66bb94369631cef229787b5e6353b6
2017-01-18 17:45:33 +00:00
insight.lee
03159e4c85 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
2017-01-18 10:44:57 +09:00
Jaewoong Jung
487458d23d Implements additional battery info menu behavior.
am: 8a49de31ab

Change-Id: I29a2a6032b02309ae9e966f517774f5ce1451c3b
2017-01-14 06:05:56 +00:00
Jaewoong Jung
8a49de31ab Implements additional battery info menu behavior.
This is a manual cherry-pick of commit
6a43a06cac.

Bug: 33352540
Test: Updated existing tests.
Change-Id: I990029d2ea9032301362d614959259965b8ecb10
2017-01-13 14:56:47 -08:00
Jaewoong Jung
c360bc5813 Adds a menu item for additional battery info to battery settings.
am: 7b557df0e4

Change-Id: Iaef847979f64bf93b87457fa3f2f734b1789c830
2017-01-13 22:40:38 +00:00
Jaewoong Jung
bd775165d4 Merge "Adds a menu item for additional battery info to battery settings." into nyc-mr2-dev 2017-01-13 22:38:11 +00:00
Jaewoong Jung
7b557df0e4 Adds a menu item for additional battery info to battery settings.
This is a manual cherry-pick of commit
1e0f8ff5e5.

Bug: 33352540
Test: No additional test failures.

Change-Id: Ibfc1a9463c93d3c087ed712fe45d3d0717472c6a
2017-01-13 12:58:44 -08:00