drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
278,321 Commits 1 Branch 0 Tags
Commit Graph

278321 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jack Yu
80a0e6d56e Added configuration for VT downgrade/tear down when data disabled 
Added a new flag that allows carriers to ignore data disabled
(e.g. data reaches limit or user disables data) so VT calls
will not be downgraded/torn down and VT service will not be
disabled.

bug: 32880745
Merged-In: Idd33a022b5a31cbc58592587bcb496bd78923ae7
Change-Id: I5c71fc9336b39f114a924861a766ca5cb93d4c69
 2016-11-17 09:59:33 -08:00
Przemyslaw Szczepaniak
ab8c119689 Merge "Track libcore change Ib691c81b158ec37419a903bfa4261a12139fbff7" am: caa816451c am: d771b36951 
am: 728ce76156

Change-Id: I8f340a9ff5f98ad028db8ebd7502f6b12d0c464c
 2016-11-17 15:56:56 +00:00
Przemyslaw Szczepaniak
728ce76156 Merge "Track libcore change Ib691c81b158ec37419a903bfa4261a12139fbff7" am: caa816451c 
am: d771b36951

Change-Id: Ia37618f5de09faa89f2ed421eae0760118c1483e
 2016-11-17 15:49:22 +00:00
Przemyslaw Szczepaniak
d771b36951 Merge "Track libcore change Ib691c81b158ec37419a903bfa4261a12139fbff7" 
am: caa816451c

Change-Id: I43c66260714bb312e270bfbae1c74047e6ef01e4
 2016-11-17 15:41:57 +00:00
Przemyslaw Szczepaniak
caa816451c Merge "Track libcore change Ib691c81b158ec37419a903bfa4261a12139fbff7" 2016-11-17 15:28:53 +00:00
Wan He
3ff4226363 Fix incorrect calculation of sizeof package structure 
Argument "package" is a pointer, not the structure.

Signed-off-by: Wan He <xiaolin.gxl@alibaba-inc.com>
 2016-11-17 18:05:20 +08:00
Pavlin Radoslavov
c51275a5e5 Merge "Don't disconnect an A2DP device when connecting to same device" am: 3ebcf1218b am: c15cc348e8 
am: ffb6a4beab

Change-Id: I2924dfe291a6a29620d4e22c47c32716516911e3
 2016-11-17 07:22:23 +00:00
Pavlin Radoslavov
ffb6a4beab Merge "Don't disconnect an A2DP device when connecting to same device" am: 3ebcf1218b 
am: c15cc348e8

Change-Id: I0754321d2e289b4c6d2d64a00d13a2d9c2bfcf1c
 2016-11-17 07:16:13 +00:00
Pavlin Radoslavov
c15cc348e8 Merge "Don't disconnect an A2DP device when connecting to same device" 
am: 3ebcf1218b

Change-Id: Ibbf94535642bbde6e35ee1dacbd27dd13f400f16
 2016-11-17 07:07:20 +00:00
Treehugger Robot
3ebcf1218b Merge "Don't disconnect an A2DP device when connecting to same device" 2016-11-17 06:58:43 +00:00
Pavlin Radoslavov
eb067ba741 Don't disconnect an A2DP device when connecting to same device 
When processing a connect request for an A2DP device, Settings
would trigger a disconnect request for all A2DP devices that
have state of CONNECTED, CONNECTING or DISCONNECTING, including
eventually the device we are connecting to.
This could create timing-related issues, and is not necessary.
Now we explicitly check to avoid disconnecting the device we are
connecting to.

Test: Manual A2DP testing with a phone and wireless headsets
Bug: 32688022
Change-Id: I572dd87c071829b734513c4b928a4d65fe539520
 2016-11-17 05:29:08 +00:00
Peter Qiu
9562122699 Merge "wifi: add constant definition for EAP types" am: a908e65b66 am: 40dfd2d0bc 
am: 120cb677f0

Change-Id: I7a1321952bd8fa0bb6a032cc847fbc0eba6ac67c
 2016-11-17 02:35:38 +00:00
Dimitry Ivanov
43b1b3ff0b Fix coretests: Remove dependency on libnativehelper 
This dependency was never needed and it makes test app
depend on private platform libraries - which is no longer allowed.

This change fixes these problems by removing dependency and renaming
JNI method.

Test: Install the test and start it.
Change-Id: I9878627148917c1b5928b98f3c86f6e6097093d6
 2016-11-16 18:35:35 -08:00
Peter Qiu
120cb677f0 Merge "wifi: add constant definition for EAP types" am: a908e65b66 
am: 40dfd2d0bc

Change-Id: I155c39131c820cf7eb77ee8b9bb2b51b3eed3d08
 2016-11-17 02:28:13 +00:00
Peter Qiu
40dfd2d0bc Merge "wifi: add constant definition for EAP types" 
am: a908e65b66

Change-Id: I283fba81ca5246222bda07f7f109d2f359e5e395
 2016-11-17 02:21:41 +00:00
Treehugger Robot
a908e65b66 Merge "wifi: add constant definition for EAP types" 2016-11-17 02:10:23 +00:00
Jerry Zhang
5ca0000141 Merge changes from topic 'usb_bugfixes-mirror-aosp-master' am: b37d826204 am: 1faf15d422 
am: 12488ed15f

Change-Id: I83b0e723f86791eaa5d5fbc7d21172a69bb8090b
 2016-11-17 00:50:53 +00:00
dooyoung.hwang
e9556a89db Share one receiver for CurrentUserTracker 
Each CurrentUserTracker has one receiver per one object.
This could cause unnecessary transaction as Tracker counts
increases. The idea of redcuing receiver is creating
one static receiver for CurrentUserTracker and share it
with all object.

Test: Check if Quicksetting order is changed properly
after switching user.

Change-Id: I8404829826391f8b315b42bbd0f50e77b783eeab
 2016-11-17 09:47:28 +09:00
Jerry Zhang
54f33d9af2 Refactored setCurrentFunction and setUsbDataUnlocked into single method. am: 935372bfd6 am: 5cbd151d40 
am: fb4a03c8f8

Change-Id: Ibdcd5074ceb48457227319f0869c6cbc62045954
 2016-11-17 00:39:07 +00:00
Jerry Zhang
e35770642d Clean up persistent usb state on boot. am: dfacad026d am: b15490ac4d 
am: 5d77efb3d9

Change-Id: I7e941f2d1491d4b0fa9b97577ac0e9cca3569673
 2016-11-17 00:38:06 +00:00
Jerry Zhang
6bb98d85a0 Fixed handling of usb state during adb changes. am: 0269ebe0fe am: 4389cb6c9a 
am: dbcbadbb99

Change-Id: Ia923cadf6131f4feeeff5b3d90ba0701c6ea8622
 2016-11-17 00:37:01 +00:00
Jerry Zhang
12488ed15f Merge changes from topic 'usb_bugfixes-mirror-aosp-master' am: b37d826204 
am: 1faf15d422

Change-Id: I00ab9ec389091e0616aa313825a8d3f0d7963eff
 2016-11-17 00:36:52 +00:00
Jerry Zhang
fb4a03c8f8 Refactored setCurrentFunction and setUsbDataUnlocked into single method. am: 935372bfd6 
am: 5cbd151d40

Change-Id: Ie2920ff5a89c5eee28a31803f9775920289e41c4
 2016-11-17 00:24:41 +00:00
Jerry Zhang
5d77efb3d9 Clean up persistent usb state on boot. am: dfacad026d 
am: b15490ac4d

Change-Id: I2fd38cd6b27685206f6aa5f11daecbc7654749d1
 2016-11-17 00:23:47 +00:00
Jerry Zhang
1faf15d422 Merge changes from topic 'usb_bugfixes-mirror-aosp-master' 
am: b37d826204

Change-Id: Id5e28b59858b16c1cfde16104feb54f2a101e366
 2016-11-17 00:22:59 +00:00
Jerry Zhang
dbcbadbb99 Fixed handling of usb state during adb changes. am: 0269ebe0fe 
am: 4389cb6c9a

Change-Id: Ie93d9df3fad63ba937b3069695744d5cadd2796c
 2016-11-17 00:22:53 +00:00
Jerry Zhang
5cbd151d40 Refactored setCurrentFunction and setUsbDataUnlocked into single method. 
am: 935372bfd6

Change-Id: I5436278e092f691c9179f7cc3709c4578b544e74
 2016-11-17 00:12:50 +00:00
Jerry Zhang
b15490ac4d Clean up persistent usb state on boot. 
am: dfacad026d

Change-Id: I762306bc76e304c6491c8af18e82bf2e0c4b433e
 2016-11-17 00:11:15 +00:00
Jerry Zhang
4389cb6c9a Fixed handling of usb state during adb changes. 
am: 0269ebe0fe

Change-Id: I2fc3674c4d5cc63febe2ebf47576f3cf1bcd1da2
 2016-11-17 00:10:25 +00:00
Ningyuan Wang
5f72d153aa Merge "Add security capabilities enums to ScanResult" am: a3c0324824 am: 6e67bb87cf 
am: 7cad272109

Change-Id: I2767e6465c125dd19e07af5d20ae4c23b3c8d1b1
 2016-11-17 00:08:51 +00:00
Ningyuan Wang
7cad272109 Merge "Add security capabilities enums to ScanResult" am: a3c0324824 
am: 6e67bb87cf

Change-Id: I02934a0a018bf759559d710f2edff1abe49df2cd
 2016-11-17 00:01:23 +00:00
Jerry Zhang
b37d826204 Merge changes from topic 'usb_bugfixes-mirror-aosp-master' 
* changes:
  Refactored setCurrentFunction and setUsbDataUnlocked into single method.
  Clean up persistent usb state on boot.
  Fixed handling of usb state during adb changes.
 2016-11-16 23:59:33 +00:00
Ningyuan Wang
6e67bb87cf Merge "Add security capabilities enums to ScanResult" 
am: a3c0324824

Change-Id: Iad2aba87155d52343b372b2d7af3e037842c1ca4
 2016-11-16 23:54:24 +00:00
Treehugger Robot
a3c0324824 Merge "Add security capabilities enums to ScanResult" 2016-11-16 23:42:25 +00:00
Peter Qiu
a32e50986e wifi: hotspot2: add copy constructor for PasspointConfiguration 
Bug: 32714562
Test: frameworks/base/wifi/tests/runtests.sh
Change-Id: Ida7e4da3d6a9679743397643e0250434dbdb43af
 2016-11-16 15:35:48 -08:00
Peter Qiu
a25d717de8 wifi: hotspot2: add support for validating passpoint configuration 
Bug: 32572199
Test: frameworks/base/wifi/tests/runtests.sh
Change-Id: I8e649430af54d863dfa5492abc3dfd79c772c765
 2016-11-16 15:08:03 -08:00
Peter Qiu
4a79ac2c82 wifi: add constant definition for EAP types 
Bug: 32810711
Test: frameworks/base/wifi/tests/runtests.sh
Change-Id: Ia62f2674e8cdf975d1380f733a8687bdb15ed197
 2016-11-16 13:49:22 -08:00
Fei Wu
643a85b09e Merge "Update colorPrimary in watch" into cw-f-dev am: 447fff8589 
am: eb70bc0d36

Change-Id: I5461cbaa37378dfa11043ed4b7fa33d72ce5955f
 2016-11-16 21:25:39 +00:00
FEI WU
13000bebe1 Update colorPrimary in watch am: 9072dcd82c 
am: 78fef4c065

Change-Id: I586f1de9d0d8c3860807c3209dba4758e3bd4701
 2016-11-16 21:24:23 +00:00
Fei Wu
eb70bc0d36 Merge "Update colorPrimary in watch" into cw-f-dev 
am: 447fff8589

Change-Id: I0e021db6fe386b0ca7a05db97add2e7f36e85b05
 2016-11-16 21:15:41 +00:00
FEI WU
78fef4c065 Update colorPrimary in watch 
am: 9072dcd82c

Change-Id: I3a869e0acddb6d0494e352bfb7e926e897105f08
 2016-11-16 21:15:38 +00:00
Fei Wu
447fff8589 Merge "Update colorPrimary in watch" into cw-f-dev 2016-11-16 21:05:28 +00:00
Yifan Hong
7ae2aa4ed9 Merge "Fix include after spliting HidlSupport.h" am: efd7b9f57d am: 2f7a3f9595 
am: afe46992b8

Change-Id: If9b589ef262ae97e85dc851bd1a5f3fe3d4c22fa
 2016-11-16 19:24:09 +00:00
Yifan Hong
afe46992b8 Merge "Fix include after spliting HidlSupport.h" am: efd7b9f57d 
am: 2f7a3f9595

Change-Id: Id85f0bb5b53ca3a693ab1bf137627159b6d382d5
 2016-11-16 19:16:45 +00:00
Ningyuan Wang
d150b2b001 Add security capabilities enums to ScanResult 
This adds enums of security parameters, including
protocol, key management, and cipher suites.

Bug: 32512793
Test: compile

Change-Id: Ibf784d79695ca5e261c6bfe623406bc693c5ac17
 2016-11-16 11:13:42 -08:00
Yifan Hong
2f7a3f9595 Merge "Fix include after spliting HidlSupport.h" 
am: efd7b9f57d

Change-Id: I6b0b3482feb169ae89ffa6e20561ad64b42d12d1
 2016-11-16 19:10:20 +00:00
Brad Ebinger
0c3541be65 Readability improvements in Logging 
We now truncate Session method paths and IDs based on the Logging level
to improve Session Logging readability in logcat. If another external
session is started off of an existing external Session, the preceding
histories are replaced with "..." so that the Session information is not
overwhelming.

Bug: 26571395
Test: Unit Tests and manual tests pass
Change-Id: I9ffda3d64f1072fa6228a82a86116a5e47d18c96
 2016-11-16 11:05:15 -08:00
Yifan Hong
efd7b9f57d Merge "Fix include after spliting HidlSupport.h" 2016-11-16 19:01:00 +00:00
Andreas Gampe
c89bd30cee Merge "Preload2: Fix dependencies" am: 3b379ee94e am: 74b4e070be 
am: 6a454c86db

Change-Id: Id214d7386401495981a75acb5a7b4a91a220e6a6
 2016-11-16 18:40:08 +00:00
Andreas Gampe
6a454c86db Merge "Preload2: Fix dependencies" am: 3b379ee94e 
am: 74b4e070be

Change-Id: I6bbc33352648a352ed8be54bb3cb2eb9e065f074
 2016-11-16 18:32:56 +00:00