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

206502 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Geoff Mendal
9ff5be7674 Import translations. DO NOT MERGE 
Auto-generated-cl: translation import

Bug: 26887782
Change-Id: If6bc1bd3f277f0289aecb7c063f899363079c248
 2016-02-01 12:21:06 -08:00
Adam Lesinski
c46f6db46e Merge "Don't change screen on time on time changes" into mnc-dr1.5-dev 2016-01-28 19:20:50 +00:00
Adam Lesinski
b2d3ffaa20 Don't change screen on time on time changes 
Screen on time should be measured in elapsed realtime, not wallclock.

Cause a checkIdleStates to occur when reloading stats
(on rollover and on time change).

When time changes occur in the negative direction, the new stats file
we create can overlap the previous one with regards to its end timestamp.
Use the begin timestamp to determine which of the latest stats to merge.
(b/22716352)

Bug: 26488100
Change-Id: If31b29bbbee9e98401205b5e26bce86e181286e7
 2016-01-27 17:51:47 -08:00
Joe LaPenna
2bccc45cec [DO NOT MERGE ANYWHERE]: Allow button events in ambient. 
am: 7528f57c4d  -s ours

* commit '7528f57c4ddbde1c6d0a2a352bd8a1af43711013':
  [DO NOT MERGE ANYWHERE]: Allow button events in ambient.
 2016-01-28 01:06:28 +00:00
Joe LaPenna
7528f57c4d [DO NOT MERGE ANYWHERE]: Allow button events in ambient. 
See thread: "key presses & Ambient"

BUG: 25964771
BUG: 26524301

Change-Id: I914edd447c38678a06d27677be4597c0ee384635
 2016-01-27 14:19:44 -08:00
Nick Vaccaro
3e413dfcdd Merge "[DO NOT MERGE ANYWHERE] Fix bodysensor permission" into cw-e-dev 
am: 907108ca0f  -s ours

* commit '907108ca0f4e69dd170a507c5830591712ec5967':
  [DO NOT MERGE ANYWHERE] Fix bodysensor permission
 2016-01-26 20:16:15 +00:00
Nick Vaccaro
907108ca0f Merge "[DO NOT MERGE ANYWHERE] Fix bodysensor permission" into cw-e-dev 2016-01-26 20:13:26 +00:00
Peng Xu
79c004b2c1 [DO NOT MERGE ANYWHERE] Fix bodysensor permission 
Bug: 26481493
Bug: 26447970
Change-Id: Ibeaf5a5e39f0dc552cf115d2834a1ec28ecef5ab
 2016-01-26 20:10:27 +00:00
Wei Liu
dca8f10031 Add a null check before reference networkInfo. 
am: b8eaf45e1d

* commit 'b8eaf45e1df007fc4f5a11bb58491abaef39cd57':
  Add a null check before reference networkInfo.
 2016-01-26 01:52:12 +00:00
Wei Liu
b8eaf45e1d Add a null check before reference networkInfo. 
b/26758858

Change-Id: If335ece223114dbfb6b08391f18a09467f377cf1
 2016-01-25 10:34:27 -08:00
Thierry Strudel
0064c4c793 Merge "Don't assume kernel tick is 100Hz" into mnc-dr1.5-dev 2016-01-22 22:07:32 +00:00
Amith Yamasani
c465e71cdc Check apps idle states on time changes 
And ensure that the listeners are informed of app standby transitions
that might occur during time changes.

Fix for apps that sometimes don't have network access until reboot.

Bug: 26488100
Change-Id: Ic342c188a6cd19faee88f50b2c6a342a6968cb23
 2016-01-22 11:27:16 -08:00
Thierry Strudel
b786aaa5a7 Don't assume kernel tick is 100Hz 
Bug: 26729731
Change-Id: I094d5fd0e611349becb91d4460bc2e4af255d125
 2016-01-21 16:31:21 -08:00
Lorenzo Colitti
a6855a1faa Merge "Debug logging for when getActiveNetworkInfo returns BLOCKED." into mnc-dr1.5-dev 2016-01-21 23:31:50 +00:00
Bryce Lee
746ea1efe3 Merge "DO NOT MERGE ANYWHERE Improve logging in BluetoothHeadsetClientCall." into cw-e-dev 
am: 2e7ecddd5b  -s ours

* commit '2e7ecddd5bb13721e5b3d55ee96b9dcf2e9148e6':
  DO NOT MERGE ANYWHERE Improve logging in BluetoothHeadsetClientCall.
 2016-01-21 23:19:06 +00:00
Bryce Lee
2e7ecddd5b Merge "DO NOT MERGE ANYWHERE Improve logging in BluetoothHeadsetClientCall." into cw-e-dev 2016-01-21 23:01:06 +00:00
Bryce Lee
fe985fa7f0 DO NOT MERGE ANYWHERE Improve logging in BluetoothHeadsetClientCall. 
Change-Id: I3b1b3946ca21c0bbc902a2c521938239a486d98a
 2016-01-21 22:54:56 +00:00
Lorenzo Colitti
c1a6ce70be Debug logging for when getActiveNetworkInfo returns BLOCKED. 
Bug: 26488100
Change-Id: I991581732d35aed18392bed2f3d69ca8fb231f5e
 2016-01-22 05:21:34 +09:00
Matthew Williams
4831ef3872 DO NOT MERGE Redact Account info from getCurrentSyncs am: a5cafd2a93 am: 06ef7dfdf0 am: 5fc753acaf -s ours am: 0d3e46391a am: 9c841923df -s ours am: a76208d4e4 am: 9e52b29fe2 am: 1f6dbd910b -s ours am: 5cb2597a9d am: 08d7e9608e 
am: c151cec56e

* commit 'c151cec56ec3666b5bb20e8cf7c3dca2500ea353':
  DO NOT MERGE Redact Account info from getCurrentSyncs
 2016-01-21 19:13:32 +00:00
Matthew Williams
c151cec56e DO NOT MERGE Redact Account info from getCurrentSyncs am: a5cafd2a93 am: 06ef7dfdf0 am: 5fc753acaf -s ours am: 0d3e46391a am: 9c841923df -s ours am: a76208d4e4 am: 9e52b29fe2 am: 1f6dbd910b -s ours am: 5cb2597a9d 
am: 08d7e9608e

* commit '08d7e9608ea822815b15be15a66f26be664ce541':
  DO NOT MERGE Redact Account info from getCurrentSyncs
 2016-01-21 19:08:07 +00:00
Matthew Williams
08d7e9608e DO NOT MERGE Redact Account info from getCurrentSyncs am: a5cafd2a93 am: 06ef7dfdf0 am: 5fc753acaf -s ours am: 0d3e46391a am: 9c841923df -s ours am: a76208d4e4 am: 9e52b29fe2 am: 1f6dbd910b -s ours 
am: 5cb2597a9d

* commit '5cb2597a9da3202229fdbc91c12b8e172b2b5667':
  DO NOT MERGE Redact Account info from getCurrentSyncs
 2016-01-21 19:01:02 +00:00
Matthew Williams
5cb2597a9d DO NOT MERGE Redact Account info from getCurrentSyncs am: a5cafd2a93 am: 06ef7dfdf0 am: 5fc753acaf -s ours am: 0d3e46391a am: 9c841923df -s ours am: a76208d4e4 am: 9e52b29fe2 
am: 1f6dbd910b  -s ours

* commit '1f6dbd910bf9bf93df8a708209e92add61fbff44':
  DO NOT MERGE Redact Account info from getCurrentSyncs
 2016-01-21 18:54:44 +00:00
Matthew Williams
1f6dbd910b DO NOT MERGE Redact Account info from getCurrentSyncs am: a5cafd2a93 am: 06ef7dfdf0 am: 5fc753acaf -s ours am: 0d3e46391a am: 9c841923df -s ours am: a76208d4e4 
am: 9e52b29fe2

* commit '9e52b29fe27035df4720db582637157ce9ce268d':
  DO NOT MERGE Redact Account info from getCurrentSyncs
 2016-01-21 18:48:55 +00:00
Matthew Williams
9e52b29fe2 DO NOT MERGE Redact Account info from getCurrentSyncs am: a5cafd2a93 am: 06ef7dfdf0 am: 5fc753acaf -s ours am: 0d3e46391a am: 9c841923df -s ours 
am: a76208d4e4

* commit 'a76208d4e4f7f690f5fde4210a00a5c3022721bd':
  DO NOT MERGE Redact Account info from getCurrentSyncs
 2016-01-21 18:41:55 +00:00
Matthew Williams
a76208d4e4 DO NOT MERGE Redact Account info from getCurrentSyncs am: a5cafd2a93 am: 06ef7dfdf0 am: 5fc753acaf -s ours am: 0d3e46391a 
am: 9c841923df  -s ours

* commit '9c841923dfc36db046909e388b8a2fda3b694be1':
  DO NOT MERGE Redact Account info from getCurrentSyncs
 2016-01-21 18:37:01 +00:00
Matthew Williams
9c841923df DO NOT MERGE Redact Account info from getCurrentSyncs am: a5cafd2a93 am: 06ef7dfdf0 am: 5fc753acaf -s ours 
am: 0d3e46391a

* commit '0d3e46391a0ffa0c428b8c8082195d1cbc4b1efa':
  DO NOT MERGE Redact Account info from getCurrentSyncs
 2016-01-21 18:29:33 +00:00
Matthew Williams
0d3e46391a DO NOT MERGE Redact Account info from getCurrentSyncs am: a5cafd2a93 am: 06ef7dfdf0 
am: 5fc753acaf  -s ours

* commit '5fc753acaf9731742957db256b2818376fe8c4a4':
  DO NOT MERGE Redact Account info from getCurrentSyncs
 2016-01-21 18:19:53 +00:00
Matthew Williams
5fc753acaf DO NOT MERGE Redact Account info from getCurrentSyncs am: a5cafd2a93 
am: 06ef7dfdf0

* commit '06ef7dfdf0a3efb44326228c55309ec6df134376':
  DO NOT MERGE Redact Account info from getCurrentSyncs
 2016-01-21 18:14:32 +00:00
Matthew Williams
06ef7dfdf0 DO NOT MERGE Redact Account info from getCurrentSyncs 
am: a5cafd2a93

* commit 'a5cafd2a93ce1c481328e2ce25c3bf2a19b81601':
  DO NOT MERGE Redact Account info from getCurrentSyncs
 2016-01-21 18:07:55 +00:00
Matthew Williams
a5cafd2a93 DO NOT MERGE Redact Account info from getCurrentSyncs 
BUG:26094635
If the caller to ContentResolver#getCurrentSyncs does not hold the
GET_ACCOUNTS permission, return a SyncInfo object that does not
contain any Account information.

Change-Id: I5628ebe1f56c8e3f784aaf1b3281e6b829d19314
(cherry picked from commit b63057e698a01dafcefc7ba09b397b0336bba43d)
 2016-01-21 14:15:11 +00:00
Jorim Jaggi
3c988197fa Fix SystemUI animator leak 
When there was a state change or layout when there was an animation
set as the mobile icon in the status bar, we never stopped the old
animation, which was infinite. This was using more and more CPU because
the animations never got stopped.

To fix this, we don't update the drawable when a layout happens and we
stop the previous animation when replacing the icon.

Bug: 26616870
Change-Id: If501155d1a99d587e50a1b77ebb03a21c940662b
 2016-01-21 01:59:27 +00:00
Chenjie Luo
8d6f1956e4 Merge "Fix bug in AssetAtlas packing loop" into cw-e-dev 
am: b2b2fb0182

* commit 'b2b2fb018243831144929b1db9db9b8eeab8d984':
  Fix bug in AssetAtlas packing loop
 2016-01-20 23:55:34 +00:00
Chenjie Luo
b2b2fb0182 Merge "Fix bug in AssetAtlas packing loop" into cw-e-dev 2016-01-20 23:38:46 +00:00
Chenjie Luo
e66554d4be Fix bug in AssetAtlas packing loop 
There is a bug in AssetAtlasService that it always choose the
MAX_SIZE as height. The for loop of height calculation starts
from MAX_SIZE and breaks when it finds a working texture. This
means the height loop will always break for the initial value.
Reording the loop optimize the algorithm to find a smaller
atlas texture. The MIN_SIZE is also changed to 512 for fewer
assets case.

Bug: 26429912
Change-Id: Ic0b2396e9697c417a24f81ec792f8a8af53915ad
 2016-01-20 14:35:29 -08:00
Matthew Williams
c77a2228aa Redact Account info from getCurrentSyncs am: f39549e389 am: 1a0aed3257 am: 0e7cd0a9fb am: be136b7a3e am: a947baa87c am: 0f292147f3 am: ce3842eb1a 
am: 85f169d19f

* commit '85f169d19f200daa35a30652905d6daf090955c6':
  Redact Account info from getCurrentSyncs
 2016-01-20 18:31:19 +00:00
Matthew Williams
85f169d19f Redact Account info from getCurrentSyncs am: f39549e389 am: 1a0aed3257 am: 0e7cd0a9fb am: be136b7a3e am: a947baa87c am: 0f292147f3 
am: ce3842eb1a

* commit 'ce3842eb1a5184331ee4aad3e36d5f11f999cf2e':
  Redact Account info from getCurrentSyncs
 2016-01-20 18:08:33 +00:00
Geoff Mendal
a341d639a7 Import translations. DO NOT MERGE 
Change-Id: I875bc3fe8f82fe0b29867e9d4790b2e57c4df566
Auto-generated-cl: translation import
 2016-01-20 09:33:02 -05:00
Matthew Williams
ce3842eb1a Redact Account info from getCurrentSyncs am: f39549e389 am: 1a0aed3257 am: 0e7cd0a9fb am: be136b7a3e am: a947baa87c 
am: 0f292147f3

* commit '0f292147f3ac803a8701afd7362ad3e0487fd496':
  Redact Account info from getCurrentSyncs
 2016-01-20 11:55:52 +00:00
Matthew Williams
0f292147f3 Redact Account info from getCurrentSyncs am: f39549e389 am: 1a0aed3257 am: 0e7cd0a9fb am: be136b7a3e 
am: a947baa87c

* commit 'a947baa87caeb6733846d6de4ef2bf84f7ab0fa1':
  Redact Account info from getCurrentSyncs
 2016-01-20 11:51:42 +00:00
Matthew Williams
a947baa87c Redact Account info from getCurrentSyncs am: f39549e389 am: 1a0aed3257 am: 0e7cd0a9fb 
am: be136b7a3e

* commit 'be136b7a3e3f117dea283d194d1e6979fb47662b':
  Redact Account info from getCurrentSyncs
 2016-01-20 11:46:39 +00:00
Matthew Williams
be136b7a3e Redact Account info from getCurrentSyncs am: f39549e389 am: 1a0aed3257 
am: 0e7cd0a9fb

* commit '0e7cd0a9fbdcb48c551d54627eb964364dd946d0':
  Redact Account info from getCurrentSyncs
 2016-01-20 11:41:23 +00:00
Matthew Williams
0e7cd0a9fb Redact Account info from getCurrentSyncs am: f39549e389 
am: 1a0aed3257

* commit '1a0aed3257ad1b8216930928090885cf4210bd87':
  Redact Account info from getCurrentSyncs
 2016-01-20 11:37:17 +00:00
Matthew Williams
1a0aed3257 Redact Account info from getCurrentSyncs 
am: f39549e389

* commit 'f39549e389edf62f43bacd95a1b8580d75ad77ed':
  Redact Account info from getCurrentSyncs
 2016-01-20 11:32:56 +00:00
Matthew Williams
f39549e389 Redact Account info from getCurrentSyncs 
BUG:26094635
If the caller to ContentResolver#getCurrentSyncs does not hold the
GET_ACCOUNTS permission, return a SyncInfo object that does not
contain any Account information.

Change-Id: I5628ebe1f56c8e3f784aaf1b3281e6b829d19314
(cherry picked from commit b63057e698a01dafcefc7ba09b397b0336bba43d)
 2016-01-20 00:02:58 +00:00
Doris Liu
a466e15223 Merge "Revert "Get animation update timing for AVD"" into mnc-dr1.5-dev 2016-01-19 19:59:53 +00:00
Doris Liu
476b686d67 Revert "Get animation update timing for AVD" 
This reverts commit fc8e3cb768b7dfd7c0ed0fb93dd9d735887e8d45.

Bug: 26616870
Change-Id: I2f018cb34f014f4ebb635e18cd940997507a4a4d
 2016-01-19 19:56:13 +00:00
Geoff Mendal
6168c078ae Import translations. DO NOT MERGE 
Change-Id: I0ff7336ca90107f45266090de0ffc634daa54722
Auto-generated-cl: translation import
 2016-01-18 09:41:08 -05:00
Thierry Strudel
fc7e682f44 Merge "Supply content description for QS disconnect buttons" into mnc-dr1.5-dev 2016-01-15 23:44:45 +00:00
Daniel Sandler
76f28bbd64 Merge "Stop leaking Notifications when they change groupKeys." into mnc-dr1.5-dev 2016-01-15 21:05:41 +00:00
Dan Sandler
24813b0dd5 Stop leaking Notifications when they change groupKeys. 
If a Notification changes groups (either from one group to
another, or gets a group key for the first time, which takes
it out of its implicit singleton group) it should be removed
from the old group in NotificationGroupManager's mGroupMap
and re-inserted under the new one.

Unfortunately we were passing the *new* notification in the
oldNotification argument, so we would always attempt (and
fail) to remove it from the *new* group, leaving a strong
reference to the Notification inside mGroupMap under an
obsolete group key.

Bug: 26561365
Change-Id: Ie5cdceb4f843dbd363652e00fbc0f3ac6f6ef247
 2016-01-15 10:29:31 -05:00