Amith Yamasani
375901244c
Check apps idle states on time changes am: c465e71cdc
...
am: d4bd4cb4b1
* commit 'd4bd4cb4b1faa8663cc8dde4d9bab15a9ec764d3':
Check apps idle states on time changes
2016-01-22 20:58:46 +00:00
Amith Yamasani
d4bd4cb4b1
Check apps idle states on time changes
...
am: c465e71cdc
* commit 'c465e71cdc401e1565c29a895a5c6d366ba5344c':
Check apps idle states on time changes
2016-01-22 20:51:34 +00:00
Deepanshu Gupta
4f3d0c6caa
Remove GregorianCalendar hack
...
Bug: http://b.android.com/199424
Change-Id: I589d153e1f57b6302c6fe3c031c5c63e33ad9996
2016-01-22 11:33:53 -08: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
David Gross
ce9c9b7bce
Merge "Add general reduction plumbing starting with Java Script::reduce()."
...
am: fca558c549
* commit 'fca558c5490e319448ce69d1f526f5a446bb3045':
Add general reduction plumbing starting with Java Script::reduce().
2016-01-22 17:07:59 +00:00
David Gross
fca558c549
Merge "Add general reduction plumbing starting with Java Script::reduce()."
2016-01-22 17:00:43 +00:00
Yoshinobu Ito
c52adfe124
Implementation of HCE for NFC-F.
...
This impementation includes HCE(Host-based Card Emulation) for NFC-F
which emulates NFC Forum Type 3 Tag on a smartphone.
Signed-off-by: Daisuke Ito <DaisukeE.Ito@jp.sony.com>
Yoshinobu Ito <Yoshinobu.Ito@jp.sony.com>
Change-Id: I1618a7fba801e0705ff3cc078206a1446b3dd56d
2016-01-22 18:14:18 +09: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
af0c4d0c7e
Merge "Debug logging for when getActiveNetworkInfo returns BLOCKED." into mnc-dr1.5-dev am: a6855a1faa
...
am: d841d71593
* commit 'd841d71593c0c4a7c5beaf5196a22d9158c2d697':
Debug logging for when getActiveNetworkInfo returns BLOCKED.
2016-01-22 00:14:27 +00:00
Bryce Lee
c248f6c7ad
Merge "DO NOT MERGE ANYWHERE Improve logging in BluetoothHeadsetClientCall." into cw-e-dev am: 2e7ecddd5b -s ours am: 746ea1efe3 -s ours
...
am: b2f0e7f6bc -s ours
* commit 'b2f0e7f6bc24914b90a2673b5e8527468de48071':
DO NOT MERGE ANYWHERE Improve logging in BluetoothHeadsetClientCall.
2016-01-21 23:55:53 +00:00
Marie Janssen
0c04ccd952
IBluetooth: remove dump(), support arguments
...
Because IBluetooth is a Binder service, we don't need dump() to
support dumpsys, just call the IBinder.dump().
Change-Id: Idcd48f758427b824e0b7eaafd091ba3fb2ff8993
2016-01-21 23:53:37 +00:00
Lorenzo Colitti
d841d71593
Merge "Debug logging for when getActiveNetworkInfo returns BLOCKED." into mnc-dr1.5-dev
...
am: a6855a1faa
* commit 'a6855a1faa898da0f4a4fdc45485dc1f4182497b':
Debug logging for when getActiveNetworkInfo returns BLOCKED.
2016-01-21 23:51:16 +00: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
b2f0e7f6bc
Merge "DO NOT MERGE ANYWHERE Improve logging in BluetoothHeadsetClientCall." into cw-e-dev am: 2e7ecddd5b -s ours
...
am: 746ea1efe3 -s ours
* commit '746ea1efe3e2acc13865f731f3b5a7cc88525c1d':
DO NOT MERGE ANYWHERE Improve logging in BluetoothHeadsetClientCall.
2016-01-21 23:30:48 +00:00
Robert Greenwalt
bd92c57a4f
Merge "Add free short codes for Direct Carrier Billing and others."
...
am: 4d9ffdf952
* commit '4d9ffdf95237c4ee59514c678fea6ff157e0eee3':
Add free short codes for Direct Carrier Billing and others.
2016-01-21 23:20:02 +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
Robert Greenwalt
4d9ffdf952
Merge "Add free short codes for Direct Carrier Billing and others."
2016-01-21 22:10:55 +00:00
John Reck
32a95af029
Merge "libhwui: fix texture memory leak"
...
am: 550d46d9da
* commit '550d46d9dae8a4de5abd36a5e2d3c101135da696':
libhwui: fix texture memory leak
2016-01-21 22:08:44 +00:00
John Reck
550d46d9da
Merge "libhwui: fix texture memory leak"
2016-01-21 21:48:24 +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
caf53acdd7
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 am: 4831ef3872
...
am: d877135d61
* commit 'd877135d616321b4b3013b302e8615a8f8b04ffa':
DO NOT MERGE Redact Account info from getCurrentSyncs
2016-01-21 19:25:51 +00:00
Matthew Williams
d877135d61
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
...
am: 4831ef3872
* commit '4831ef3872f7f5c5d2ea0838f0958412e3833aeb':
DO NOT MERGE Redact Account info from getCurrentSyncs
2016-01-21 19:20:31 +00: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
Sergio Giro
e2296d490d
Merge "org.apache.conn.ssl: rename DistinguishedNameParser to AndroidDistinguishedNameParser"
...
am: eb93182dfb
* commit 'eb93182dfb862df27e479d30c7b8e12f13e5def5':
org.apache.conn.ssl: rename DistinguishedNameParser to AndroidDistinguishedNameParser
2016-01-21 17:20:41 +00:00
Sergio Giro
eb93182dfb
Merge "org.apache.conn.ssl: rename DistinguishedNameParser to AndroidDistinguishedNameParser"
2016-01-21 17:08:21 +00:00
Sergio Giro
ab72367506
org.apache.conn.ssl: rename DistinguishedNameParser to AndroidDistinguishedNameParser
...
The name DistinguishedNameParser is used by other libraries having the
same package, and some apps incorrectly include packages that are
present in the boot classpath. This relatively newly introduced
DistinguishedNameParser ends up hiding the ones in the libraries.
Bug: 26647082
Change-Id: I735aef3c1e5dd04e5a8e2eda6da6d9c9179f1c70
2016-01-21 17:04:58 +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
8867fbdd8d
Fix SystemUI animator leak am: 3c988197fa
...
am: 7a1c656269
* commit '7a1c6562694faaee4bf30a3b06573e96e93034ff':
Fix SystemUI animator leak
2016-01-21 05:38:53 +00:00
Jorim Jaggi
7a1c656269
Fix SystemUI animator leak
...
am: 3c988197fa
* commit '3c988197fac989e4cca7fd1a96f6489e8ed4a05b':
Fix SystemUI animator leak
2016-01-21 05:34:13 +00:00
Dohyun Lee
c5a3efd286
libhwui: fix texture memory leak
...
When there is not enough space and we cannot delete any
Texture in TextureCache to secure space, a new Texture is
created over and over again for the same SkBitmap and
there is the case that it is not deleted.
This patch avoids such cases.
Change-Id: Ic5353995e6d0716c31fe3bb49c60ec1a71574643
Signed-off-by: Dohyun Lee <leedhyun11@gmail.com>
2016-01-21 13:46:21 +09: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
5d092a1356
Merge "Fix bug in AssetAtlas packing loop" into cw-e-dev am: b2b2fb0182 am: 8d6f1956e4
...
am: bf9a587ca8
* commit 'bf9a587ca8528219e46fc35746d6ec8a8e6568d1':
Fix bug in AssetAtlas packing loop
2016-01-21 00:33:46 +00:00
Chenjie Luo
bf9a587ca8
Merge "Fix bug in AssetAtlas packing loop" into cw-e-dev am: b2b2fb0182
...
am: 8d6f1956e4
* commit '8d6f1956e46cefed0eaa754a468805e2e4d61972':
Fix bug in AssetAtlas packing loop
2016-01-21 00:11:23 +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
Vasco Brito
f31caeaa8b
Add free short codes for Direct Carrier Billing and others.
...
Whitelist free short code batch 2016 Q1 - Android Partner
Engineering.
All short codes are used by Direct Carrier Billing on
Google Play except for the short code 83669 in "gb" which
is used by a banking application.
Change-Id: Idbc02e697c8923288beb0b88545e6cee448ad4f5
Signed-off-by: Vasco Brito <vascob@google.com>
2016-01-20 23:39:23 +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
88d641ce26
Redact Account info from getCurrentSyncs am: f39549e389 am: 1a0aed3257 am: 0e7cd0a9fb am: be136b7a3e am: a947baa87c am: 0f292147f3 am: ce3842eb1a am: 85f169d19f am: c77a2228aa
...
am: 4cc10825f0
* commit '4cc10825f0234d365016a18e1f86d61cbd2fd030':
Redact Account info from getCurrentSyncs
2016-01-20 18:44:07 +00:00