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

206707 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Amit Mahajan
2b260b0006 Merge "DO NOT MERGE Adding new intent for EMERGENCY_CALL_STATE_CHANGE" into mnc-dr1.5-dev 
am: 658fdf8426

* commit '658fdf8426e5c0fb68b7c04af651eae93a32b4b4':
  DO NOT MERGE Adding new intent for EMERGENCY_CALL_STATE_CHANGE
 2016-01-14 06:30:15 +00:00
Amit Mahajan
c6c9b2aa66 Merge "Allow turning off Wi-Fi when emergency call is made [DO NOT MERGE]" into mnc-dr1.5-dev 2016-01-14 06:28:47 +00:00
Amit Mahajan
658fdf8426 Merge "DO NOT MERGE Adding new intent for EMERGENCY_CALL_STATE_CHANGE" into mnc-dr1.5-dev 2016-01-14 06:26:26 +00:00
Chenjie Luo
7034a6e2d0 Merge "Add STEM_1, STEM_2 and STEM_3 key as wakeup keys" into cw-e-dev am: 4a577bff96 
am: d5cea64d8d

* commit 'd5cea64d8d63e9ffb61af1e669962de08ea513cc':
  Add STEM_1, STEM_2 and STEM_3 key as wakeup keys
 2016-01-14 02:29:13 +00:00
Vinit Deshpande
1bbc082a47 Allow turning off Wi-Fi when emergency call is made [DO NOT MERGE] 
Bug: 24147407

Change-Id: Ia07b8bc4ccbdaeea18ed22fbfcf813f71ddfa7dc
 2016-01-13 18:27:16 -08:00
Chenjie Luo
d5cea64d8d Merge "Add STEM_1, STEM_2 and STEM_3 key as wakeup keys" into cw-e-dev 
am: 4a577bff96

* commit '4a577bff9674f4bc748ab76bf48ac6e7d3e567cc':
  Add STEM_1, STEM_2 and STEM_3 key as wakeup keys
 2016-01-14 02:24:48 +00:00
Chenjie Luo
4a577bff96 Merge "Add STEM_1, STEM_2 and STEM_3 key as wakeup keys" into cw-e-dev 2016-01-14 02:22:15 +00:00
Amit Mahajan
7e8b8f1734 DO NOT MERGE Adding new intent for EMERGENCY_CALL_STATE_CHANGE 
Bug: 24147407
Change-Id: Ida957b9cc6b9c3e13bc8660213ce5cf979c886d5
 2016-01-14 01:59:55 +00:00
Chenjie Luo
bad498f7fd Add STEM_1, STEM_2 and STEM_3 key as wakeup keys 
Bug: 25860409
Change-Id: I3f525c9c8df81807d98391c70cd2d1f8c139c8f5
 2016-01-14 01:26:05 +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
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
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
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
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
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
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
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
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
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
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
Jason Monk
05130f3f23 Get data type from service state as well 
am: 67b2c16a9a

* commit '67b2c16a9a9060d37888bdab4dfadd384a76e9d7':
  Get data type from service state as well
 2016-01-12 18:51:32 +00:00
Alan Viverette
d9434699e4 Merge "Handle null result from getVirtualChildAt()" into mnc-dr1.5-dev 2016-01-12 18:19:33 +00:00
Marco Nelissen
7d9fab680e Fix race condition when setting default ringtones 
If the device was powered off during first boot, after media scanner
inserted some entries but before the default ringtone settings were
set (or committed to disk), the default settings would not be set
on subsequent boots.

Bug: 18625739
Bug: 22349910
Bug: 25633323
Change-Id: I8ff5d3c4f842297d0675e1f5cbe17c0709a14158
 2016-01-12 17:12:36 +00:00
Jason Monk
67b2c16a9a Get data type from service state as well 
Bug: 26276354
Bug: 26413831
Change-Id: Ic080300db7d5e5200caf611cc2ee1ef3af93736e
 2016-01-12 10:24:09 -05:00
Alan Viverette
e5e59c6da4 Avoid drawable invalidation during draw() 
Prevents infinite invalidation loop when reusing a drawable asset within
a single draw() call. Also reduces unnecessary extra invalidations due to
drawable setters (ex. setBounds()) being called during draw().

Bug: 26329675
Change-Id: I31b3c99e8efd4193415cc562a84c8939a2f56c2d
(cherry picked from commit 8cda8e915916b3166e4496589b802fd1ed553c77)
 2016-01-12 15:07:47 +00:00
Alan Viverette
ec2891b562 Handle null result from getVirtualChildAt() 
Also adds final where the method was being called, adds Nullable
annotation to method, and updates docs.

Bug: 25985497
Change-Id: I847a8507f2e3970f1340cddf4abf8650dda22b35
(cherry picked from commit ad52693cf3dfe3f5e84f5a22fe4c3787f2f2cbfb)
 2016-01-12 14:23:05 +00:00
Doris Liu
7537aa7596 Merge "Get animation update timing for AVD" into mnc-dr1.5-dev 
am: a73abeaf4b

* commit 'a73abeaf4b7b158664c34124d8df39ad843f7451':
  Get animation update timing for AVD
 2016-01-12 01:39:05 +00:00
Doris Liu
a73abeaf4b Merge "Get animation update timing for AVD" into mnc-dr1.5-dev 2016-01-12 01:36:23 +00:00
Raph Levien
728a2fa272 Merge changes from topic \'grapheme-dr1.5\' into mnc-dr1.5-dev 
am: 9f2c939730

* commit '9f2c939730730e76afc46e891b82499b499503e1':
  Respect grapheme clusters in Layout#getOffsetForHorizontal.
  Fix: Cursor can be at an invalid offset in EditText.
 2016-01-12 01:15:06 +00:00
Raph Levien
50c22adc25 Merge "Fix measurement to respect grapheme and span boundaries" into mnc-dr1.5-dev 
am: 36c5ab3542

* commit '36c5ab3542624f9634106390fa34482babe2d8d3':
  Fix measurement to respect grapheme and span boundaries
 2016-01-12 01:13:37 +00:00
Raph Levien
9f2c939730 Merge changes from topic 'grapheme-dr1.5' into mnc-dr1.5-dev 
* changes:
  Respect grapheme clusters in Layout#getOffsetForHorizontal.
  Fix: Cursor can be at an invalid offset in EditText.
 2016-01-12 01:10:52 +00:00
Raph Levien
36c5ab3542 Merge "Fix measurement to respect grapheme and span boundaries" into mnc-dr1.5-dev 2016-01-12 01:10:52 +00:00
Adam Lesinski
1f1cbc01c1 Merge "UsageStatsService: Fix app idle issue at rollover time" into mnc-dr1.5-dev 
am: 15df80f069

* commit '15df80f069c72989539df560c02f377ae9214ae2':
  UsageStatsService: Fix app idle issue at rollover time
 2016-01-12 00:38:09 +00:00
Adam Lesinski
15df80f069 Merge "UsageStatsService: Fix app idle issue at rollover time" into mnc-dr1.5-dev 2016-01-12 00:28:28 +00:00