Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
301,953 Commits 3 Branches 0 Tags
ec4e0b075f53ac83cb03db07c00a67ea0f1e3a34
Commit Graph

301953 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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 3acf0382da

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
Teng-Hui Zhu
18ad5f4368 Update the documentation related to VD / AVD 
fix:32705240
fix:32683765
fix:32831830
fix:32705244

Test: make offline-sdk-docs and view the HTML file.

Change-Id: I6ae3e5850494f13a241b2e9e4d2c5b95d5199aae
 2016-11-16 15:14:10 -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
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
Teng-Hui Zhu
037fc1815b Recreate the bitmap cache when it is smaller than needed 
fix:32780212

Test: Existing CTS and attached repro apk.

Change-Id: Ib908319af6539b2438b850f7a50d5a539cef8368
 2016-11-16 13:01:02 -08: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
Matt Sarett
79756be175 Add layer updates debugging feature to Skia pipelines 
When this property is turned on, we flash green
every time a hardware layer is updated.

Test: Matches the behavior in OpenGLPipeline

BUG:32370375

Change-Id: I916f94eee644c185d8a3f9fa4cd69e087ed1e92d
 2016-11-16 15:17:04 -05:00
Stephen Chen
28d8939314 Add ACTION_WIFI_SAVED_NETWORK_SETTINGS to Settings. 
Exposes an activity that deep links into saved network Settings.

Bug: 32738882
Test: gts test
Change-Id: Idfd45a8ab424a5508012675058e3498ebbc5e228
 2016-11-16 11:47:47 -08:00
Yifan Hong
0378c186c7 Merge "Fix include after spliting HidlSupport.h" am: efd7b9f57d am: 2f7a3f9595 am: afe46992b8 
am: 7ae2aa4ed9

Change-Id: I400a01127f077fa0d0656eafc4ccc15aed375fcd
 2016-11-16 19:31:11 +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
6a0cb767b2 Merge "Preload2: Fix dependencies" am: 3b379ee94e am: 74b4e070be am: 6a454c86db 
am: c89bd30cee

Change-Id: I613d29d4a32266282d73a1c61482fd5a35f58953
 2016-11-16 18:47:34 +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
Chad Brubaker
c41c889b3e Merge "Use a 16 byte random suffix for installed apk directory name" 2016-11-16 18:38:21 +00:00
Adam Powell
bb3aa34055 Fix bugs around inflated child fragments 
Framework edition

* Ensure that a fragment that has had its view destroyed has a chance
  to recreate it.

* Clear mInLayout after views are destroyed

* Make sure that when a fragment is restored from the back stack and
  reinflates its view that child fragments from fragment tags are
  reconnected properly.

Bug: 32691935
Test: cts
Change-Id: I370d6db46e72fd8ac35f716e2130b9e10b93b1da
 2016-11-16 10:34:57 -08:00
Andreas Gampe
6a454c86db Merge "Preload2: Fix dependencies" am: 3b379ee94e 
am: 74b4e070be

Change-Id: I6bbc33352648a352ed8be54bb3cb2eb9e065f074
 2016-11-16 18:32:56 +00:00
Derek Sollenberger
c4fbada76a Support Surface and Layer Readback in the SkiaPipelines. 
Test: CTS TextureViewTests and UIRendering
Change-Id: I2969c8f5a975bfd9aebcbb585c64d1fcbb2487c2
 2016-11-16 13:30:00 -05:00
Andreas Gampe
74b4e070be Merge "Preload2: Fix dependencies" 
am: 3b379ee94e

Change-Id: If3ecad631e5f7deb9b2f348a26d9b41f8a00b4f5
 2016-11-16 18:25:37 +00:00
Fyodor Kupolov
de4355dd59 Merge "Log when priv permission is not whitelisted" 2016-11-16 18:24:55 +00:00
Fyodor Kupolov
b633f9d01f Log when priv permission is not whitelisted 
Log violations for now, we will start enforcing it later.

Test: Manual - device boots
Bug: 32935038
Bug: 32935364
Change-Id: I1957c334f98852a5a87e093e24c72dd2c223c08b
 2016-11-16 18:22:36 +00:00