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

199967 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Adrian Roos
8dfe1b045b am f221e4b5: am 8aa14b59: am dbcf0a9e: Merge "ImageWallpaper: Atomically fetch display info" into mnc-dev 
* commit 'f221e4b52b0a702aeb832b98db9b336e68b0715c':
  ImageWallpaper: Atomically fetch display info
 2015-06-10 01:34:50 +00:00
Tao Bao
ebd3df9666 am 24dde3b8: am 86468ae7: am cfa9a98e: Merge "Improve the reboot-to-recovery dialogs" 
* commit '24dde3b836c2623b993aa8bbf147278e0af68943':
  Improve the reboot-to-recovery dialogs
 2015-06-10 01:34:45 +00:00
Tao Bao
480942f5f2 am 24c0de22: am 7807cc25: (-s ours) am e215b464: Merge "Wait for uncrypt to finish before rebooting" 
* commit '24c0de2205b310d185bf57d899d882139a7ecc85':
  Wait for uncrypt to finish before rebooting
 2015-06-10 01:34:40 +00:00
Adrian Roos
5b7793cacf Merge "Expand scrim all the way to the right" into mnc-dev 2015-06-10 01:29:56 +00:00
Dianne Hackborn
3fca7b7929 am 4f8fdd93: am 113769d7: Merge "Fix NPE." into mnc-dev 
* commit '4f8fdd93329e5f78a21e6eeee75f99a6c9399743':
  Fix NPE.
 2015-06-10 01:29:22 +00:00
Svetoslav
a1e60f1f45 Merge "Use who when requesting permissions" into mnc-dev 2015-06-10 01:29:21 +00:00
Lajos Molnar
831656d328 am a390a202: am 53858ced: Merge "media: hook up OnFrameRenderedListener events to framework events" into mnc-dev 
* commit 'a390a202d27834e06b8a32b0aff2399db2855733':
  media: hook up OnFrameRenderedListener events to framework events
 2015-06-10 01:29:17 +00:00
Adrian Roos
f221e4b52b am 8aa14b59: am dbcf0a9e: Merge "ImageWallpaper: Atomically fetch display info" into mnc-dev 
* commit '8aa14b59d360ad0140dae7a1e6ecdc6b11017ea5':
  ImageWallpaper: Atomically fetch display info
 2015-06-10 01:29:13 +00:00
Adrian Roos
2f2bd9a8f8 Expand scrim all the way to the right 
Fixes a bug where the scrim would not cover
the area occupied by the nav bar which looks weird
when the nav bar is hidden.

Bug: 19582019
Change-Id: I7d96ca46a41ec764984be5fe42d225cb94f53497
 2015-06-10 01:29:12 +00:00
Adrian Roos
9454847618 Merge "Add content description to keyguard user avatar" into mnc-dev 2015-06-10 01:28:31 +00:00
Tao Bao
24dde3b836 am 86468ae7: am cfa9a98e: Merge "Improve the reboot-to-recovery dialogs" 
* commit '86468ae72d7d7266ec5c13d300add0dafd63432f':
  Improve the reboot-to-recovery dialogs
 2015-06-10 01:23:24 +00:00
Tao Bao
24c0de2205 am 7807cc25: (-s ours) am e215b464: Merge "Wait for uncrypt to finish before rebooting" 
* commit '7807cc259f4e4a2506c8d37601c947eca68b2d24':
  Wait for uncrypt to finish before rebooting
 2015-06-10 01:23:19 +00:00
Svetoslav
970b59cbe3 Use who when requesting permissions 
Change-Id: Id0b231f8b74099b7877eb4441a1664416c641731
 2015-06-09 18:17:44 -07:00
Dianne Hackborn
4f8fdd9332 am 113769d7: Merge "Fix NPE." into mnc-dev 
* commit '113769d70b2221697ad9a9553da68ec6483cbfa1':
  Fix NPE.
 2015-06-10 01:16:41 +00:00
Lajos Molnar
a390a202d2 am 53858ced: Merge "media: hook up OnFrameRenderedListener events to framework events" into mnc-dev 
* commit '53858ced4cfe4717d90b298e7fb4ffa18effcfcf':
  media: hook up OnFrameRenderedListener events to framework events
 2015-06-10 01:16:36 +00:00
Adrian Roos
8aa14b59d3 am dbcf0a9e: Merge "ImageWallpaper: Atomically fetch display info" into mnc-dev 
* commit 'dbcf0a9e7d36545b73225ba2c164beb4b0ad9a06':
  ImageWallpaper: Atomically fetch display info
 2015-06-10 01:16:32 +00:00
Christopher Ferris
34a12cf4d8 am eef3beb1: am 24b90915: am 6c4fc3a0: Merge "Change wtf errors from ASSERT to ERROR." 
* commit 'eef3beb1e3c7bbfd7dd94a1f413bb00ff4d93579':
  Change wtf errors from ASSERT to ERROR.
 2015-06-10 01:10:15 +00:00
Christopher Ferris
a544e16c48 am 8d6417f5: am 0a778262: am 1a4b8288: Merge "Change wtf errors from ASSERT to ERROR." into mnc-dev 
* commit '8d6417f5509dbf7268156af9d42dc3c0f93a8fa0':
  Change wtf errors from ASSERT to ERROR.
 2015-06-10 01:10:10 +00:00
Adrian Roos
ffc9097d10 Add content description to keyguard user avatar 
Bug: 20535812
Change-Id: I32ff0878c2332681ebd848c9da6e2dc42363b9be
 2015-06-09 18:09:49 -07:00
Chien-Yu Chen
bf2d55b2b5 Camera2: Clarify capture order for reprocess 
Clarify the order of regular and reprocess requests in capture()
and captureBurst().

Bug: 21558022
Change-Id: I6bc3eda9614e43a954540ad271b4145a4dbcc8f2
 2015-06-09 18:09:11 -07:00
Dianne Hackborn
113769d70b Merge "Fix NPE." into mnc-dev 2015-06-10 01:06:29 +00:00
Lajos Molnar
53858ced4c Merge "media: hook up OnFrameRenderedListener events to framework events" into mnc-dev 2015-06-10 01:04:50 +00:00
Christopher Ferris
eef3beb1e3 am 24b90915: am 6c4fc3a0: Merge "Change wtf errors from ASSERT to ERROR." 
* commit '24b90915a10e2ccc8e1090364956cf79470dff52':
  Change wtf errors from ASSERT to ERROR.
 2015-06-10 01:04:04 +00:00
Adrian Roos
dbcf0a9e7d Merge "ImageWallpaper: Atomically fetch display info" into mnc-dev 2015-06-10 01:02:48 +00:00
Tao Bao
86468ae72d am cfa9a98e: Merge "Improve the reboot-to-recovery dialogs" 
* commit 'cfa9a98e99286e3cf1f89f80b37a5a9ff37c30c3':
  Improve the reboot-to-recovery dialogs
 2015-06-10 00:55:30 +00:00
Tao Bao
7807cc259f am e215b464: Merge "Wait for uncrypt to finish before rebooting" 
* commit 'e215b46482af78b6259c867815dc5cf2198908d5':
  Wait for uncrypt to finish before rebooting
 2015-06-10 00:55:23 +00:00
Christopher Ferris
8d6417f550 am 0a778262: am 1a4b8288: Merge "Change wtf errors from ASSERT to ERROR." into mnc-dev 
* commit '0a7782625717252c00f39aa0748ece34adf467ce':
  Change wtf errors from ASSERT to ERROR.
 2015-06-10 00:54:00 +00:00
Stefan Kuhne
0204ba2b5b am ff6fe716: am e6581b11: am 011c133e: Merge "Dont create a dummy animation for a transferred animation" into mnc-dev 
* commit 'ff6fe7164e89822a2f8dc124cde4ef8809d46f22':
  Dont create a dummy animation for a transferred animation
 2015-06-10 00:53:48 +00:00
Dianne Hackborn
c0cdfa5947 Fix NPE. 
Change-Id: Iea1faf4b3070ed29884e133e3bab54401bd77bcf
 2015-06-09 17:53:47 -07:00
Fyodor Kupolov
39947d63dd am 7e1c4917: am 1f6cbb5d: am c2ae0090: Merge "Do not create profile if FEATURE_MANAGED_USERS is not available" into mnc-dev 
* commit '7e1c4917aba076b2d92e66f6971002996ab63e44':
  Do not create profile if FEATURE_MANAGED_USERS is not available
 2015-06-10 00:53:43 +00:00
Christopher Ferris
24b90915a1 am 6c4fc3a0: Merge "Change wtf errors from ASSERT to ERROR." 
* commit '6c4fc3a08e9ca52a36f7fc83b783185da34abc12':
  Change wtf errors from ASSERT to ERROR.
 2015-06-10 00:46:48 +00:00
Tao Bao
cfa9a98e99 Merge "Improve the reboot-to-recovery dialogs" 2015-06-10 00:43:58 +00:00
Tao Bao
e215b46482 Merge "Wait for uncrypt to finish before rebooting" 2015-06-10 00:43:47 +00:00
Stefan Kuhne
ff6fe7164e am e6581b11: am 011c133e: Merge "Dont create a dummy animation for a transferred animation" into mnc-dev 
* commit 'e6581b11a96442337eeec12f1ca5c87b3408fbe4':
  Dont create a dummy animation for a transferred animation
 2015-06-10 00:40:45 +00:00
Fyodor Kupolov
7e1c4917ab am 1f6cbb5d: am c2ae0090: Merge "Do not create profile if FEATURE_MANAGED_USERS is not available" into mnc-dev 
* commit '1f6cbb5d76cd0e2d0aaab05ae6e779e60ed8caa2':
  Do not create profile if FEATURE_MANAGED_USERS is not available
 2015-06-10 00:40:40 +00:00
Christopher Ferris
0a77826257 am 1a4b8288: Merge "Change wtf errors from ASSERT to ERROR." into mnc-dev 
* commit '1a4b8288ad525ec9e951010151e4ed91bd514043':
  Change wtf errors from ASSERT to ERROR.
 2015-06-10 00:38:44 +00:00
Christopher Ferris
6c4fc3a08e Merge "Change wtf errors from ASSERT to ERROR." 2015-06-10 00:32:25 +00:00
Christopher Ferris
70e23e0d14 Change wtf errors from ASSERT to ERROR. 
Calling println_native with the value of ASSERT will set the abort
message. Unfortunately, there are numerous cases where one thread aborts,
but before that thread can communicate with debuggerd, another thread
calls wtf, which overwrites the abort message from the original
failing thread.

Fix this by changing this to an error level log message.

Bug: 21490722
(cherry picked from commit 2d073ba83c570466a7f77d1cd9193ab4a60eaee4)

Change-Id: Ib9daedf114a2e0ecc424641e4929cc4d15b0c776
 2015-06-09 17:31:37 -07:00
Stefan Kuhne
e6581b11a9 am 011c133e: Merge "Dont create a dummy animation for a transferred animation" into mnc-dev 
* commit '011c133e3c98ccf95fe4626d30c739c5a35d986e':
  Dont create a dummy animation for a transferred animation
 2015-06-10 00:26:11 +00:00
Fyodor Kupolov
1f6cbb5d76 am c2ae0090: Merge "Do not create profile if FEATURE_MANAGED_USERS is not available" into mnc-dev 
* commit 'c2ae0090d2f6b9f36b4027e79f0430d29853a193':
  Do not create profile if FEATURE_MANAGED_USERS is not available
 2015-06-10 00:26:07 +00:00
Christopher Ferris
1a4b8288ad Merge "Change wtf errors from ASSERT to ERROR." into mnc-dev 2015-06-10 00:25:32 +00:00
Stefan Kuhne
011c133e3c Merge "Dont create a dummy animation for a transferred animation" into mnc-dev 2015-06-10 00:21:49 +00:00
Fyodor Kupolov
c2ae0090d2 Merge "Do not create profile if FEATURE_MANAGED_USERS is not available" into mnc-dev 2015-06-10 00:16:14 +00:00
Dianne Hackborn
098e4bf040 am 45c75dea: am 549aacfe: am 47669522: Merge "Fix issue #21621920: VI: need mechanism to get current request" into mnc-dev 
* commit '45c75dea7f1c03e4e899e5316785731b91daf85b':
  Fix issue #21621920: VI: need mechanism to get current request
 2015-06-10 00:14:03 +00:00
Zheng Fu
50ef8f5eb6 Merge "un-hide raw_contacts.backup_id and expose metadatasync to system." 2015-06-10 00:06:04 +00:00
Dianne Hackborn
45c75dea7f am 549aacfe: am 47669522: Merge "Fix issue #21621920: VI: need mechanism to get current request" into mnc-dev 
* commit '549aacfe9a299a61b5bc5acc2b776ac545cd855b':
  Fix issue #21621920: VI: need mechanism to get current request
 2015-06-10 00:00:11 +00:00
Erik Kline
35d5f52c28 am baad4077: am 69b0dcab: am 64d6ce8a: Merge "initial revision of NetworkDiagnostics" into mnc-dev 
* commit 'baad4077955905933b9b5a8cdd6e82349cc68c96':
  initial revision of NetworkDiagnostics
 2015-06-10 00:00:10 +00:00
Fyodor Kupolov
b615799504 Do not create profile if FEATURE_MANAGED_USERS is not available 
Bug: 21629701
Change-Id: Ia0f720eee0faa0d565701064a268948f6dea82e4
 2015-06-09 16:51:13 -07:00
Zheng Fu
7997bee366 un-hide raw_contacts.backup_id and expose metadatasync to system. 
Bug:18930508
Change-Id: I37eb7ca41416becb549ebe5b1986925952a943c9
 2015-06-09 16:50:02 -07:00
Adrian Roos
9b9947de5d ImageWallpaper: Atomically fetch display info 
Previously we fetched rotation and dimens separately
which had the potential to cause inconsistencies.

Bug: 21440533
Change-Id: Ic537dbc01fc27af14124b1d97d4babafb6bc15f8
 2015-06-09 16:48:57 -07:00