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

296382 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
TreeHugger Robot
2ba9de340b Merge "Add a category key for development options." 2016-11-17 02:34:35 +00: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
TreeHugger Robot
6bc6b6fe5a Merge "Report boot statistics" 2016-11-17 01:39:12 +00:00
Jerry Zhang
bb2965d239 Merge commit '6bb98d85a0a0790ed2b600f4a165ab79ad536f04' into manual_merge_6bb98d8 
Change-Id: I43ad588644c03a2174146525ad62b3d512d66074
 2016-11-16 17:37:54 -08:00
TreeHugger Robot
0d11dc0cbb Merge "Switch back to NativeAllocationRegistry" 2016-11-17 01:20:33 +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
Fan Zhang
1a28d6359d Merge "Remove tiles pointing to same intent within same category." 2016-11-17 00:43:07 +00: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
Ningyuan Wang
4a4213845b Merge "Add security capabilities enums to ScanResult" am: a3c0324824 am: 6e67bb87cf am: 7cad272109 
am: 5f72d153aa

Change-Id: Idf96f8abaed98608d8252484e9eba86d669ac7d4
 2016-11-17 00:22:06 +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
Jeff Sharkey
0bf53b162a Merge "Yet another interface that should be oneway." 2016-11-16 23:31:32 +00:00
John Reck
b99fff5d48 Switch back to NativeAllocationRegistry 
Bug: 32881864

Partial revert of 3acf0382da22cda88234e599cd81b1ff5441cc35

Test: none

Change-Id: Ie749e0ef0a84ff820b1ea445422cf28112d62209
 2016-11-16 15:30:16 -08:00
Fan Zhang
e9bb36caa6 Add a category key for development options. 
Bug: 32623105
Test: RunSettingsLibRoboTests
Change-Id: I892385d3acf11c3d02df30a5cc9d73e3ecf8612c
 2016-11-16 15:26:06 -08:00
Todd Kennedy
3e12f413d4 Merge "Implement 2-phase resolution" 2016-11-16 23:05:34 +00:00
TreeHugger Robot
2eb0a8b4d5 Merge "Fixing typo in method comment." 2016-11-16 22:31:56 +00:00
TreeHugger Robot
c4428c1e1a Merge "Add layer updates debugging feature to Skia pipelines" 2016-11-16 22:13:45 +00:00
Wale Ogunwale
782b247fdb Merge "Fixed issue with IME displaying on-top of nav bar." 2016-11-16 21:58:07 +00:00
Wale Ogunwale
93726a41a0 Merge "Don't include sysUI insets on secondary displays" 2016-11-16 21:56:55 +00: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
Chad Brubaker
da153f5af4 Merge "Shift ApplicationInfo private flags" 2016-11-16 21:46:23 +00:00
Fei Wu
3321f400fc Merge "Update colorPrimary in watch" into cw-f-dev am: 447fff8589 am: eb70bc0d36 
am: 643a85b09e

Change-Id: I8d7b0cefb1793d8287528004421b171b9748ec28
 2016-11-16 21:41:54 +00:00
FEI WU
774e043502 Update colorPrimary in watch am: 9072dcd82c am: 78fef4c065 
am: 13000bebe1

Change-Id: Icf82000120b76ae525ad1f6af45fa153c4b27964
 2016-11-16 21:38:16 +00: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
Jeff Sharkey
55079a9ec2 Yet another interface that should be oneway. 
Test: builds
Bug: 32715088
Change-Id: I85e90733454bdd7bccb06e29625a61f93153fea4
 2016-11-16 14:18:10 -07: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
Kweku Adams
86f39a4287 Fixing typo in method comment. 
Test: none

Change-Id: I5583e4de17da0ddd28b12ee879b27a24734906fb
 2016-11-16 21:01:27 +00:00
TreeHugger Robot
c05077fc7a Merge "Fix bugs around inflated child fragments Framework edition" 2016-11-16 21:00:33 +00:00
Fan Zhang
5fa4af08c6 Remove tiles pointing to same intent within same category. 
Bug: 32874082
Test: RunSettingsLibRoboTests
Change-Id: I155495882663ed60cbf21c9a5651709ac3cbd137
 2016-11-16 12:40:35 -08:00
Wale Ogunwale
44fbdf5b1e Fixed issue with IME displaying on-top of nav bar. 
Caused by some recent refactoring. We now make sure the IME
has the higher animation layer in its base layer of the window
it is targeting.
Also, consolidated some of our test functions.

Bug: 32916670
Test: bit FrameworksServicesTests:com.android.server.wm.WindowLayersControllerTests
Change-Id: I0b1abd6fead981cfc810488cc785261abba5341d
 2016-11-16 20:38:50 +00:00