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

214093 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Adam Lesinski
6a8c328d73 Merge "UsageStats: Use new settings key idle_duration2 for app idle" into mnc-dr1.5-dev am: d2e215978b 
am: a5c7106017

* commit 'a5c71060174c5357c75592998fb095e768eca8bd':
  UsageStats: Use new settings key idle_duration2 for app idle
 2016-01-14 00:59:58 +00:00
Adam Lesinski
a5c7106017 Merge "UsageStats: Use new settings key idle_duration2 for app idle" into mnc-dr1.5-dev 
am: d2e215978b

* commit 'd2e215978be9df2f3d2bf56eb1c857c6a1bc420a':
  UsageStats: Use new settings key idle_duration2 for app idle
 2016-01-14 00:54:10 +00:00
Adam Lesinski
d2e215978b Merge "UsageStats: Use new settings key idle_duration2 for app idle" into mnc-dr1.5-dev 2016-01-14 00:45:31 +00:00
Nancy Zheng
b05f242bc8 Pulling in https://android-review.googlesource.com/#/c/186482/1 am: 74dfcf90f1 am: f474056e99 
am: f4c56a21a3

* commit 'f4c56a21a389e70b472e4e7e586c7cf59a444f8e':
  Pulling in https://android-review.googlesource.com/#/c/186482/1
 2016-01-14 00:23:20 +00:00
Nancy Zheng
f4c56a21a3 Pulling in https://android-review.googlesource.com/#/c/186482/1 am: 74dfcf90f1 
am: f474056e99

* commit 'f474056e99de892b731155989ee0d9dae1d3eea7':
  Pulling in https://android-review.googlesource.com/#/c/186482/1
 2016-01-14 00:12:14 +00:00
Nancy Zheng
f474056e99 Pulling in https://android-review.googlesource.com/#/c/186482/1 
am: 74dfcf90f1

* commit '74dfcf90f18d8d0e1128707a5986c4fa94d70350':
  Pulling in https://android-review.googlesource.com/#/c/186482/1
 2016-01-13 23:59:42 +00:00
Nancy Zheng
74dfcf90f1 Pulling in https://android-review.googlesource.com/#/c/186482/1 
Fix memory leak in HWUI

std::unique_ptr::release just releases the ownership of the
managed object. To delete the object, std::unique_ptr::reset
function should be called.

Bug: 26116596
Change-Id: If65f74085b1fc2be3a9fffc433326e0bcdb40ff3
 2016-01-13 15:23:56 -08:00
Selim Cinek
a8a4d29aec Merge "Fixed a crash with the heads up manager" into mnc-dr1.5-dev am: d23f1eb0cd 
am: 804ff964af

* commit '804ff964afed8154c5b169cd1f2bb6e89dc05f2f':
  Fixed a crash with the heads up manager
 2016-01-13 23:14:26 +00:00
Ian Pedowitz
105108209f Merge "Revert "Avoid drawable invalidation during draw()"" into mnc-dr1.5-dev am: 624d43b66f 
am: 0cd5e9f475

* commit '0cd5e9f475cd31535ad33a6d2151f2270bd3f29c':
  Revert "Avoid drawable invalidation during draw()"
 2016-01-13 23:10:29 +00:00
Selim Cinek
804ff964af Merge "Fixed a crash with the heads up manager" into mnc-dr1.5-dev 
am: d23f1eb0cd

* commit 'd23f1eb0cd9893395573a4059be195e8fdb1007a':
  Fixed a crash with the heads up manager
 2016-01-13 23:10:20 +00:00
Ian Pedowitz
0cd5e9f475 Merge "Revert "Avoid drawable invalidation during draw()"" into mnc-dr1.5-dev 
am: 624d43b66f

* commit '624d43b66f039e3b0f33274486512621919d96a3':
  Revert "Avoid drawable invalidation during draw()"
 2016-01-13 23:01:29 +00:00
Selim Cinek
d23f1eb0cd Merge "Fixed a crash with the heads up manager" into mnc-dr1.5-dev 2016-01-13 23:01:13 +00:00
Ian Pedowitz
624d43b66f Merge "Revert "Avoid drawable invalidation during draw()"" into mnc-dr1.5-dev 2016-01-13 22:47:45 +00:00
Alan Viverette
156bd49bdc Revert "Avoid drawable invalidation during draw()" 
This reverts commit e5e59c6da424096da8f57137cdc57d8bd410b079.

Drawables expect to be able to call invalidateSelf() during
draw() to pump animation frames. We shouldn't break this.

Bug: 26533725
Change-Id: Ibe2871f2622faf836637225fc1e3e6f0ca6def47
 2016-01-13 21:49:10 +00:00
Selim Cinek
ba9e8586e3 Fixed a crash with the heads up manager 
Bug: 25693389
Change-Id: Id852e342000bff6de0ce19f442eb53b21e935b7b
 2016-01-13 21:13:33 +00:00
Adam Lesinski
f0ef3c1126 UsageStats: Use new settings key idle_duration2 for app idle 
Ignores the old, re-appropriated key "idle_duration" which is now
set to a high value in order to force disable app idle on devices
with bug b/26355386

Bug:26355386
Change-Id: Iff9de843ad6e547d29c1583687fc7f7ce7e15090
 2016-01-13 12:48:50 -08:00
Robert Greenwalt
be81d28798 Merge "Add free short codes for Direct Carrier Billing in Google Play" 
am: d736cba6e7

* commit 'd736cba6e7f93a2e6df172a644e413f27a1dc939':
  Add free short codes for Direct Carrier Billing in Google Play
 2016-01-13 20:48:14 +00:00
Pavel Zhamaitsiak
e737a028b1 Merge "Add WiFi Calling overlays for T-Mobile\'s MCCMNCs" into mnc-dr1.5-dev am: 9ae30e69ad 
am: fba6bccff5

* commit 'fba6bccff5d230b581e46ed64911d0c67e4be442':
  Add WiFi Calling overlays for T-Mobile's MCCMNCs
 2016-01-13 20:44:08 +00:00
Pavel Zhamaitsiak
fba6bccff5 Merge "Add WiFi Calling overlays for T-Mobile\'s MCCMNCs" into mnc-dr1.5-dev 
am: 9ae30e69ad

* commit '9ae30e69ada03ebf3408ed1d2f24a5a67ea33b68':
  Add WiFi Calling overlays for T-Mobile's MCCMNCs
 2016-01-13 20:35:46 +00:00
Robert Greenwalt
d736cba6e7 Merge "Add free short codes for Direct Carrier Billing in Google Play" 2016-01-13 20:35:34 +00:00
Pavel Zhamaitsiak
9ae30e69ad Merge "Add WiFi Calling overlays for T-Mobile's MCCMNCs" into mnc-dr1.5-dev 2016-01-13 20:30:46 +00:00
Pavel Zhamaitsiak
b6baaf30cd Add WiFi Calling overlays for T-Mobile's MCCMNCs 
Bug: 26024279
Change-Id: I71920fc45dec3e4fe5a3f4e349ff1ba3df703000
 2016-01-13 11:19:05 -08:00
Keisuke Kuroyanagi
404a22cf74 Tests for getPrimaryHorizontal with grapheme boundaries am: a5c53291a8 
am: 3bb115ba5c

* commit '3bb115ba5c8f176a355384f98e0b5348499b8b76':
  Tests for getPrimaryHorizontal with grapheme boundaries
 2016-01-13 19:03:56 +00:00
Keisuke Kuroyanagi
3bb115ba5c Tests for getPrimaryHorizontal with grapheme boundaries 
am: a5c53291a8

* commit 'a5c53291a8123fa0296c849fe153a7dcf79b4dda':
  Tests for getPrimaryHorizontal with grapheme boundaries
 2016-01-13 18:57:42 +00:00
Keisuke Kuroyanagi
a5c53291a8 Tests for getPrimaryHorizontal with grapheme boundaries 
Bug: 25375561
Change-Id: I022473627499d7f18105e3a300754fae5be7da8e
 2016-01-13 18:50:43 +00:00
Adam Lesinski
dd0957caf4 Merge "UsageStats: Fix issue where initializing data for first time would cause crash" into mnc-dr1.5-dev am: f2cc98bc96 
am: 112e26646f

* commit '112e26646f334bed6ee202765b09e6687dde1436':
  UsageStats: Fix issue where initializing data for first time would cause crash
 2016-01-13 02:12:06 +00:00
Adam Lesinski
112e26646f Merge "UsageStats: Fix issue where initializing data for first time would cause crash" into mnc-dr1.5-dev 
am: f2cc98bc96

* commit 'f2cc98bc967c1b14d779198046137bf13aeb219c':
  UsageStats: Fix issue where initializing data for first time would cause crash
 2016-01-13 02:04:17 +00:00
Adam Lesinski
f2cc98bc96 Merge "UsageStats: Fix issue where initializing data for first time would cause crash" into mnc-dr1.5-dev 2016-01-13 01:48:45 +00:00
Adam Lesinski
76e9d76c22 UsageStats: Fix issue where initializing data for first time would cause crash 
With the updated rolling window of stats for app idleness, we need to make sure
it is populated before we initialize some defaults.

Now that we look at older entries to figure out idleness, if those
entries are in the future (due to time change), set them to the current
screen on time.
Bug:26504153

Change-Id: Ia22add0e8eaf0f137002bbe3e91d747fef5b7d69
 2016-01-12 16:52:45 -08:00
Samuel Tan
3caecaec60 Merge "Remove PersistableBundle.aidl from Java framework" 
am: 2e37bfd2d2

* commit '2e37bfd2d2f629ca50ecf0e6674484cd30560d26':
  Remove PersistableBundle.aidl from Java framework
 2016-01-12 23:17:50 +00:00
Samuel Tan
2e37bfd2d2 Merge "Remove PersistableBundle.aidl from Java framework" 2016-01-12 23:09:52 +00:00
Matthew Bouyack
099bd9ca8f Merge "In CanvasContext::doFrame, make a separate call to computeFrameTimeNanos and save the result. Then pass that value to UiFrameInfoBuilder::setVsync as both arguments." into cw-e-dev am: eebf168e43 am: e0845e8629 
am: 6222bb0f6a

* commit '6222bb0f6a772c8fa1dc402740399b0ad1017520':
  In CanvasContext::doFrame, make a separate call to computeFrameTimeNanos and save the result. Then pass that value to UiFrameInfoBuilder::setVsync as both arguments.
 2016-01-12 22:45:49 +00:00
Samuel Tan
239951a91e Remove PersistableBundle.aidl from Java framework 
Remove PersistableBundle.aidl from the Java framework, since it
has been moved to the native libbinder.

BUG: 26292234
Change-Id: Ia3dc49a3ad92f4c579e6dff0606c1db8fb3be76b
TEST: aosp_arm builds successfully.
 2016-01-12 14:43:32 -08:00
Matthew Bouyack
6222bb0f6a Merge "In CanvasContext::doFrame, make a separate call to computeFrameTimeNanos and save the result. Then pass that value to UiFrameInfoBuilder::setVsync as both arguments." into cw-e-dev am: eebf168e43 
am: e0845e8629

* commit 'e0845e86299a35f84ad63177047745de5a6020e9':
  In CanvasContext::doFrame, make a separate call to computeFrameTimeNanos and save the result. Then pass that value to UiFrameInfoBuilder::setVsync as both arguments.
 2016-01-12 22:40:13 +00:00
Michael Wright
35bdda107f Merge "Make sure NaturalSurfaceLayout is consistent with SurfaceControl" 
am: 6fa9c5cd01

* commit '6fa9c5cd01e36c62d5ad7efa230d4e52f457c148':
  Make sure NaturalSurfaceLayout is consistent with SurfaceControl
 2016-01-12 22:40:10 +00:00
Matthew Bouyack
e0845e8629 Merge "In CanvasContext::doFrame, make a separate call to computeFrameTimeNanos and save the result. Then pass that value to UiFrameInfoBuilder::setVsync as both arguments." into cw-e-dev 
am: eebf168e43

* commit 'eebf168e43e4a455a74e949cc0d7e156b231a697':
  In CanvasContext::doFrame, make a separate call to computeFrameTimeNanos and save the result. Then pass that value to UiFrameInfoBuilder::setVsync as both arguments.
 2016-01-12 22:33:09 +00:00
Matthew Bouyack
eebf168e43 Merge "In CanvasContext::doFrame, make a separate call to computeFrameTimeNanos and save the result. Then pass that value to UiFrameInfoBuilder::setVsync as both arguments." into cw-e-dev 2016-01-12 22:28:21 +00:00
Michael Wright
6fa9c5cd01 Merge "Make sure NaturalSurfaceLayout is consistent with SurfaceControl" 2016-01-12 22:20:52 +00:00
Michael Wright
cb034e495c Merge "Animate backlight quickly when display state request to change or power mode changed" 
am: 3a87cb0192

* commit '3a87cb0192052e20724b9107bc37d9e2d80978e2':
  Animate backlight quickly when display state request to change or power mode changed
 2016-01-12 21:55:08 +00:00
Michael Wright
3a87cb0192 Merge "Animate backlight quickly when display state request to change or power mode changed" 2016-01-12 21:46:38 +00:00
Kenny Root
5defc912cd Merge "Track changes in libcore" 
am: a15ef2abab

* commit 'a15ef2abab566468af66d431303a1645069dd094':
  Track changes in libcore
 2016-01-12 21:07:06 +00:00
Kenny Root
a15ef2abab Merge "Track changes in libcore" 2016-01-12 20:59:32 +00:00
Kenny Root
790c944eca Track changes in libcore 
The OCSP update added some API changes necessary to interact with it.
This change tracks the addition of the API.

Change-Id: I22c0448848747943bc039ff8e8fd0a1f0c531224
 2016-01-12 12:58:07 -08:00
Alan Viverette
ea2e422c23 Merge "Avoid drawable invalidation during draw()" into mnc-dr1.5-dev am: cf6885b7b7 
am: c783ebc13a

* commit 'c783ebc13a350f3f83dbe0713af9581e39b355ec':
  Avoid drawable invalidation during draw()
 2016-01-12 20:43:33 +00:00
Matthew Bouyack
7f667e7a08 In CanvasContext::doFrame, make a separate call to computeFrameTimeNanos 
and save the result. Then pass that value to
UiFrameInfoBuilder::setVsync as both arguments.

The order of function argument evaluation is undefined in C++. Because
the value returned from TimeLord::latestVsync may be changed by
the preceding call to TimeLord::computeFrameTimeNanos the values of the
arguments passed to UiFrameInfoBuilder::setVsync is also undefined. This
change removes any ambiguity.

Change-Id: Ie71ee453f9ccc725edfe5f7cc9b277f2a809dfdc
 2016-01-12 12:01:48 -08:00
Alan Viverette
c783ebc13a Merge "Avoid drawable invalidation during draw()" into mnc-dr1.5-dev 
am: cf6885b7b7

* commit 'cf6885b7b7665b5589c0640e1cf4b98780f3aeec':
  Avoid drawable invalidation during draw()
 2016-01-12 19:22:16 +00:00
Alan Viverette
cf6885b7b7 Merge "Avoid drawable invalidation during draw()" into mnc-dr1.5-dev 2016-01-12 19:18:28 +00:00
Alan Viverette
19150f05c4 Merge "Handle null result from getVirtualChildAt()" into mnc-dr1.5-dev am: d9434699e4 
am: 9c0890ea4b

* commit '9c0890ea4b2144ac3175d07a09df1dd18f0e2e22':
  Handle null result from getVirtualChildAt()
 2016-01-12 19:00:26 +00:00
Jason Monk
8ced692e44 Get data type from service state as well am: 67b2c16a9a 
am: 05130f3f23

* commit '05130f3f237efbbf497b770938e0b758a646de1a':
  Get data type from service state as well
 2016-01-12 18:58:28 +00:00
Alan Viverette
9c0890ea4b Merge "Handle null result from getVirtualChildAt()" into mnc-dr1.5-dev 
am: d9434699e4

* commit 'd9434699e4ef8c528ce01223ee9ef200bfd693e4':
  Handle null result from getVirtualChildAt()
 2016-01-12 18:53:45 +00:00