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

268807 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Todd Kennedy
418fb41ac5 Merge \"Update CTS shims\" into nyc-dev 
am: 6f140a249a

Change-Id: I46a95ea5eb9199c63e8f0a62ddf7c6eac149147d
 2016-06-15 01:35:09 +00:00
Winson
461f3809ea Merge \"Merge \\\"Only skip trimming task if the stacks are not null.\\\" into nyc-dev am: 6ba96df815 am: f9eed3bf86\" into nyc-mr1-dev-plus-aosp 
am: 875debe401

Change-Id: I8ab7e1cd1bb8bc03a0326e431338d223f98e2bfa
 2016-06-15 01:31:37 +00:00
Sudheer Shanka
6ad26f192d Merge \"Merge \\\"Allow apps with CREATE_USERS permission to call UM.getUserInfo.\\\" into nyc-dev am: 159c13801b am: 5df969f778\" into nyc-mr1-dev-plus-aosp 
am: aee4d8a058

Change-Id: I473c36a921e70044730d5be2b01bf1d41a4ff017
 2016-06-15 01:31:35 +00:00
David Friedman
65448fc910 Merge \"Merge \\\"Docs: Adds SurfaceView to API Overview page for Android-N DP4.\\\" into nyc-dev am: ea1f3cb5c3 am: f93ef9d4bc\" into nyc-mr1-dev-plus-aosp 
am: ab26de73b0

Change-Id: I2fa3ea2e7cea0ee33f5ff5a62473ab0ae7cec5ca
 2016-06-15 01:29:45 +00:00
TreeHugger Robot
6f140a249a Merge "Update CTS shims" into nyc-dev 2016-06-15 01:29:43 +00:00
Winson
b205f5a997 Merge \\\"Only skip trimming task if the stacks are not null.\\\" into nyc-dev am: 6ba96df815 am: f654d3e081 
am: 87cff0ba08

Change-Id: Ieec94ccf440a737e39551f5b264509d017ec9665
 2016-06-15 01:29:42 +00:00
Sudheer Shanka
e2b87c4b7a Merge \\\"Allow apps with CREATE_USERS permission to call UM.getUserInfo.\\\" into nyc-dev am: 159c13801b am: 1f096663e8 
am: b8d43da675

Change-Id: I63872a15b30d5fc7fede187019d01aa26cf3c68f
 2016-06-15 01:29:39 +00:00
David Friedman
e1de04eb9a Merge \\\"Docs: Adds SurfaceView to API Overview page for Android-N DP4.\\\" into nyc-dev am: ea1f3cb5c3 am: ee13234773 
am: 91140eb466

Change-Id: I8c136acf3675a2d2771cf811aa61628254f17310
 2016-06-15 01:29:36 +00:00
Robert Carr
201be25a7b Merge \\\"Toast timeout: Just strip FLAG_KEEP_SCREEN_ON\\\" into nyc-dev am: 3e5df9fb50 am: 5077dd948f 
am: e4a0fa46dd

Change-Id: Ib3c6e985e170e3ebdfa72f4de0dc6cd8d3fac08b
 2016-06-15 01:29:33 +00:00
Android Build Merger (Role)
875debe401 Merge "Merge \\"Only skip trimming task if the stacks are not null.\\" into nyc-dev am: 6ba96df815 am: f9eed3bf86" into nyc-mr1-dev-plus-aosp 2016-06-15 01:26:44 +00:00
Android Build Merger (Role)
aee4d8a058 Merge "Merge \\"Allow apps with CREATE_USERS permission to call UM.getUserInfo.\\" into nyc-dev am: 159c13801b am: 5df969f778" into nyc-mr1-dev-plus-aosp 2016-06-15 01:26:34 +00:00
Android Build Merger (Role)
ab26de73b0 Merge "Merge \\"Docs: Adds SurfaceView to API Overview page for Android-N DP4.\\" into nyc-dev am: ea1f3cb5c3 am: f93ef9d4bc" into nyc-mr1-dev-plus-aosp 2016-06-15 01:26:27 +00:00
Winson
ef74b45aae Merge \\"Only skip trimming task if the stacks are not null.\\" into nyc-dev am: 6ba96df815 
am: f9eed3bf86

Change-Id: I1ff302336f1ddd2178e71de126441f08bb13ffa9
 2016-06-15 01:25:56 +00:00
Sudheer Shanka
6d7a949eec Merge \\"Allow apps with CREATE_USERS permission to call UM.getUserInfo.\\" into nyc-dev am: 159c13801b 
am: 5df969f778

Change-Id: I0ddce3fb5087a2deae54dd676313a9b77156e397
 2016-06-15 01:25:54 +00:00
David Friedman
aec4b71fe9 Merge \\"Docs: Adds SurfaceView to API Overview page for Android-N DP4.\\" into nyc-dev am: ea1f3cb5c3 
am: f93ef9d4bc

Change-Id: Ifcc0fba668ca8a8fd4bf77bb4c525fcc4e2ea07e
 2016-06-15 01:25:51 +00:00
Robert Carr
cb274ba3f7 Merge \\\"Unbreak Javadoc on getAttestationChallenge()\\\" into nyc-dev am: 2c2f8acdab am: 31eece5af9 
am: 3cff553f3a

Change-Id: Ifb518a33e93dfdeb86233c0a063fa32703d3e448
 2016-06-15 01:25:40 +00:00
Winson
87cff0ba08 Merge \\"Only skip trimming task if the stacks are not null.\\" into nyc-dev am: 6ba96df815 
am: f654d3e081

Change-Id: I08322a664374d16829f87391c913e0aba44f3cfb
 2016-06-15 01:24:59 +00:00
Andrew Solovay
cb64ef6067 docs: Wording change for Support Lib 24.0 release notes 
See first comment for doc stage location.

bug: 29215447
Change-Id: I75b1dc88e19e557c9ffee6336bfc342a17d1271f
 2016-06-14 18:21:22 -07:00
Sudheer Shanka
b8d43da675 Merge \\"Allow apps with CREATE_USERS permission to call UM.getUserInfo.\\" into nyc-dev am: 159c13801b 
am: 1f096663e8

Change-Id: I10f0d321d246ec70fc55b38c9f6a43dcf3280f0e
 2016-06-15 01:20:30 +00:00
David Friedman
91140eb466 Merge \\"Docs: Adds SurfaceView to API Overview page for Android-N DP4.\\" into nyc-dev am: ea1f3cb5c3 
am: ee13234773

Change-Id: I21ee8eb3586e8c085c6d0d048233a4383f889072
 2016-06-15 01:20:27 +00:00
Robert Carr
e4a0fa46dd Merge \\"Toast timeout: Just strip FLAG_KEEP_SCREEN_ON\\" into nyc-dev am: 3e5df9fb50 
am: 5077dd948f

Change-Id: Iebfc46bb349456e11937fdfa82a8fe6a5a15d950
 2016-06-15 01:20:20 +00:00
Shawn Willden
e27b0a4caa Merge \"Merge \\\"Unbreak Javadoc on getAttestationChallenge()\\\" into nyc-dev am: 2c2f8acdab am: 2da8166a68\" into nyc-mr1-dev-plus-aosp 
am: 0dc04c0d2b

Change-Id: I528383942dae9bf443ed0363a61cbe0f7e4e674e
 2016-06-15 01:16:07 +00:00
Shawn Willden
170b939824 Merge \\\"Unbreak Javadoc on getAttestationChallenge()\\\" into nyc-dev am: 2c2f8acdab am: 6bc69459ed 
am: 6cbb70ebf1

Change-Id: I7731abb8eb2048b9e2d2640406d5b55fdc886bc1
 2016-06-15 01:16:05 +00:00
Winson
f654d3e081 Merge \"Only skip trimming task if the stacks are not null.\" into nyc-dev 
am: 6ba96df815

Change-Id: I6551328b80a849013ea121ded03333e2a9475145
 2016-06-15 01:16:03 +00:00
Winson
f9eed3bf86 Merge \"Only skip trimming task if the stacks are not null.\" into nyc-dev 
am: 6ba96df815

Change-Id: I58b230bb33330fbb130094cc937c4aeaf5976baa
 2016-06-15 01:16:02 +00:00
Shawn Willden
3cff553f3a Merge \\"Unbreak Javadoc on getAttestationChallenge()\\" into nyc-dev am: 2c2f8acdab 
am: 31eece5af9

Change-Id: Ib802115dde54f3fdaee73e42b0376318f944cc1e
 2016-06-15 01:15:44 +00:00
Sudheer Shanka
1f096663e8 Merge \"Allow apps with CREATE_USERS permission to call UM.getUserInfo.\" into nyc-dev 
am: 159c13801b

Change-Id: Ic83a0ae31afac6b94fcfba8ceee986326fb300ab
 2016-06-15 01:12:21 +00:00
David Friedman
ee13234773 Merge \"Docs: Adds SurfaceView to API Overview page for Android-N DP4.\" into nyc-dev 
am: ea1f3cb5c3

Change-Id: Ib6e5fd941a3b091274fc5af2428f4a567abb5b69
 2016-06-15 01:12:19 +00:00
Android Build Merger (Role)
0dc04c0d2b Merge "Merge \\"Unbreak Javadoc on getAttestationChallenge()\\" into nyc-dev am: 2c2f8acdab am: 2da8166a68" into nyc-mr1-dev-plus-aosp 2016-06-15 01:12:19 +00:00
Robert Carr
5077dd948f Merge \"Toast timeout: Just strip FLAG_KEEP_SCREEN_ON\" into nyc-dev 
am: 3e5df9fb50

Change-Id: I59d035329b3e6acbc929564ba7ce1107943c6587
 2016-06-15 01:12:17 +00:00
Sudheer Shanka
5df969f778 Merge \"Allow apps with CREATE_USERS permission to call UM.getUserInfo.\" into nyc-dev 
am: 159c13801b

Change-Id: Ic4d94327a21f2a8b8ae175e057039eafb9c2d698
 2016-06-15 01:12:11 +00:00
David Friedman
f93ef9d4bc Merge \"Docs: Adds SurfaceView to API Overview page for Android-N DP4.\" into nyc-dev 
am: ea1f3cb5c3

Change-Id: Ia61b3fd592e19c7fb021b0f22e3eeb8bbc6b5b4f
 2016-06-15 01:12:07 +00:00
Robert Carr
31eece5af9 Merge \"Toast timeout: Just strip FLAG_KEEP_SCREEN_ON\" into nyc-dev 
am: 3e5df9fb50

Change-Id: I97742b1d180ff1c38a1aa7ea0a13c981a38c1df3
 2016-06-15 01:12:03 +00:00
Shawn Willden
f759bca921 Merge \\"Unbreak Javadoc on getAttestationChallenge()\\" into nyc-dev am: 2c2f8acdab 
am: 2da8166a68

Change-Id: I14d955073b1093199d05ea7f4f431bc1b74f81f7
 2016-06-15 01:11:57 +00:00
Shawn Willden
6cbb70ebf1 Merge \\"Unbreak Javadoc on getAttestationChallenge()\\" into nyc-dev am: 2c2f8acdab 
am: 6bc69459ed

Change-Id: I9fdafe59c549cd8a9cf15e7f05d0aad446954bab
 2016-06-15 01:11:44 +00:00
Andrew Solovay
a92895b017 docs: Updating N preview release notes for DP4 
See first comment for doc stage location.

bug: 28982873
Change-Id: I692b361f4a0d2d3627fa8cea19082fc24306f470
 2016-06-14 18:09:43 -07:00
TreeHugger Robot
6ba96df815 Merge "Only skip trimming task if the stacks are not null." into nyc-dev 2016-06-15 01:08:59 +00:00
Shawn Willden
2da8166a68 Merge \"Unbreak Javadoc on getAttestationChallenge()\" into nyc-dev 
am: 2c2f8acdab

Change-Id: I89b9c88159f99681049ce401f22ca9ea8578b27c
 2016-06-15 01:05:26 +00:00
Chris Thornton
db68331871 Merge \\"Prevent NPE when updating models without a vendor UUID\\" into nyc-mr1-dev am: ad5c30bdb2 
am: 7d07319673

Change-Id: Iffe0716e74dfcabe1957960ff639352929ec6ae3
 2016-06-15 01:05:12 +00:00
Shawn Willden
6bc69459ed Merge \"Unbreak Javadoc on getAttestationChallenge()\" into nyc-dev 
am: 2c2f8acdab

Change-Id: Id639d2ce9ac95fc1a0a87048e5b3f8b8137c5fdd
 2016-06-15 01:04:48 +00:00
TreeHugger Robot
159c13801b Merge "Allow apps with CREATE_USERS permission to call UM.getUserInfo." into nyc-dev 2016-06-15 01:02:34 +00:00
Chris Thornton
7d07319673 Merge \"Prevent NPE when updating models without a vendor UUID\" into nyc-mr1-dev 
am: ad5c30bdb2

Change-Id: I11f22f6f265564184cd22fd3286ebcf6b9e488e5
 2016-06-15 01:00:29 +00:00
David Friedman
ea1f3cb5c3 Merge "Docs: Adds SurfaceView to API Overview page for Android-N DP4." into nyc-dev 2016-06-15 00:59:54 +00:00
TreeHugger Robot
3e5df9fb50 Merge "Toast timeout: Just strip FLAG_KEEP_SCREEN_ON" into nyc-dev 2016-06-15 00:59:21 +00:00
TreeHugger Robot
2c2f8acdab Merge "Unbreak Javadoc on getAttestationChallenge()" into nyc-dev 2016-06-15 00:56:47 +00:00
TreeHugger Robot
ad5c30bdb2 Merge "Prevent NPE when updating models without a vendor UUID" into nyc-mr1-dev 2016-06-15 00:56:30 +00:00
David Friedman
521da6ac5c Docs: Adds SurfaceView to API Overview page for Android-N DP4. 
Change-Id: I29854c82ef788b00c1ebc305bc5faf463c2d8dc8
 2016-06-14 17:55:38 -07:00
Dirk Dougherty
917d204444 Merge \\\"Add API 24 to reference selector.\\\" into nyc-dev am: 398d088871 am: 8d129efa23 
am: fc0aed25b0

Change-Id: If15cfbf21c8859934f66389632be8f7949b4a2d4
 2016-06-15 00:49:20 +00:00
Winson
2ed7c47e27 Disabling fading icons when freeform mode is enabled. 
Bug: 28398344
Change-Id: If0c38c10153f490a7443ce36b0a5d17bb685b1a8
 2016-06-15 00:46:04 +00:00
Dirk Dougherty
8930555a4a Merge \\\"Add API 24 to reference selector.\\\" into nyc-dev am: 398d088871 am: f44feb36b0 
am: f992a2af12

Change-Id: Ie77f470408603acddb50a39738003dfa407b7183
 2016-06-15 00:44:18 +00:00