OSDN Git Service
Chad Brubaker [Mon, 25 Jan 2016 18:14:39 +0000 (18:14 +0000)]
Merge "Add getApplicationConfigForPackage"
am:
7519dce8c2
* commit '
7519dce8c2742b8abcc884a930552c8372b777fd':
Add getApplicationConfigForPackage
Chad Brubaker [Mon, 25 Jan 2016 18:03:13 +0000 (18:03 +0000)]
Merge "Add getApplicationConfigForPackage"
Martijn Coenen [Mon, 25 Jan 2016 09:56:20 +0000 (09:56 +0000)]
Merge "Implementation of HCE for NFC-F."
am:
e168012ff2
* commit '
e168012ff21408f8be85040bb4ac977061519f62':
Implementation of HCE for NFC-F.
Martijn Coenen [Mon, 25 Jan 2016 09:48:43 +0000 (09:48 +0000)]
Merge "Implementation of HCE for NFC-F."
Chad Brubaker [Sat, 23 Jan 2016 05:48:07 +0000 (21:48 -0800)]
Add getApplicationConfigForPackage
This allows services which make network connections on behalf of
applications to honor the application's network security policy.
Change-Id: I562b7bd0eb20f2f8c9f8342c211166d4e3397780
Jorim Jaggi [Sat, 23 Jan 2016 02:18:13 +0000 (02:18 +0000)]
Merge "NullPointerException when starting VoiceInteractionManagerService"
am:
b7fbe1104f
* commit '
b7fbe1104fd93b426dd6a6f2ed9dfc9cb12b4dd8':
NullPointerException when starting VoiceInteractionManagerService
Jorim Jaggi [Sat, 23 Jan 2016 02:09:36 +0000 (02:09 +0000)]
Merge "NullPointerException when starting VoiceInteractionManagerService"
Deepanshu Gupta [Sat, 23 Jan 2016 00:02:05 +0000 (00:02 +0000)]
Merge "Remove GregorianCalendar hack"
am:
187c022bf1
* commit '
187c022bf187f137d48d9031c43cfc233c9fc158':
Remove GregorianCalendar hack
Deepanshu Gupta [Fri, 22 Jan 2016 23:53:07 +0000 (23:53 +0000)]
Merge "Remove GregorianCalendar hack"
Thierry Strudel [Fri, 22 Jan 2016 22:28:41 +0000 (22:28 +0000)]
Merge "Don\'t assume kernel tick is 100Hz" into mnc-dr1.5-dev am:
0064c4c793
am:
e8b476e8e8
* commit '
e8b476e8e81ee8bc4fe70fbc78db2f496b2aa023':
Don't assume kernel tick is 100Hz
Thierry Strudel [Fri, 22 Jan 2016 22:20:30 +0000 (22:20 +0000)]
Merge "Don\'t assume kernel tick is 100Hz" into mnc-dr1.5-dev
am:
0064c4c793
* commit '
0064c4c79341bcb47bcb5b9ff568871f34f1dc63':
Don't assume kernel tick is 100Hz
Thierry Strudel [Fri, 22 Jan 2016 22:07:32 +0000 (22:07 +0000)]
Merge "Don't assume kernel tick is 100Hz" into mnc-dr1.5-dev
Amith Yamasani [Fri, 22 Jan 2016 20:58:46 +0000 (20:58 +0000)]
Check apps idle states on time changes am:
c465e71cdc
am:
d4bd4cb4b1
* commit '
d4bd4cb4b1faa8663cc8dde4d9bab15a9ec764d3':
Check apps idle states on time changes
Amith Yamasani [Fri, 22 Jan 2016 20:51:34 +0000 (20:51 +0000)]
Check apps idle states on time changes
am:
c465e71cdc
* commit '
c465e71cdc401e1565c29a895a5c6d366ba5344c':
Check apps idle states on time changes
Deepanshu Gupta [Fri, 22 Jan 2016 19:11:57 +0000 (11:11 -0800)]
Remove GregorianCalendar hack
Bug: http://b.android.com/199424
Change-Id: I589d153e1f57b6302c6fe3c031c5c63e33ad9996
Amith Yamasani [Fri, 22 Jan 2016 19:27:16 +0000 (11:27 -0800)]
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
David Gross [Fri, 22 Jan 2016 17:07:59 +0000 (17:07 +0000)]
Merge "Add general reduction plumbing starting with Java Script::reduce()."
am:
fca558c549
* commit '
fca558c5490e319448ce69d1f526f5a446bb3045':
Add general reduction plumbing starting with Java Script::reduce().
David Gross [Fri, 22 Jan 2016 17:00:43 +0000 (17:00 +0000)]
Merge "Add general reduction plumbing starting with Java Script::reduce()."
Yoshinobu Ito [Fri, 22 Jan 2016 09:14:18 +0000 (18:14 +0900)]
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
Thierry Strudel [Fri, 22 Jan 2016 00:31:21 +0000 (16:31 -0800)]
Don't assume kernel tick is 100Hz
Bug:
26729731
Change-Id: I094d5fd0e611349becb91d4460bc2e4af255d125
Lorenzo Colitti [Fri, 22 Jan 2016 00:14:27 +0000 (00:14 +0000)]
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.
Bryce Lee [Thu, 21 Jan 2016 23:55:53 +0000 (23:55 +0000)]
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.
Lorenzo Colitti [Thu, 21 Jan 2016 23:51:16 +0000 (23:51 +0000)]
Merge "Debug logging for when getActiveNetworkInfo returns BLOCKED." into mnc-dr1.5-dev
am:
a6855a1faa
* commit '
a6855a1faa898da0f4a4fdc45485dc1f4182497b':
Debug logging for when getActiveNetworkInfo returns BLOCKED.
Lorenzo Colitti [Thu, 21 Jan 2016 23:31:50 +0000 (23:31 +0000)]
Merge "Debug logging for when getActiveNetworkInfo returns BLOCKED." into mnc-dr1.5-dev
Bryce Lee [Thu, 21 Jan 2016 23:30:48 +0000 (23:30 +0000)]
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.
Robert Greenwalt [Thu, 21 Jan 2016 23:20:02 +0000 (23:20 +0000)]
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.
Bryce Lee [Thu, 21 Jan 2016 23:19:06 +0000 (23:19 +0000)]
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.
Bryce Lee [Thu, 21 Jan 2016 23:01:06 +0000 (23:01 +0000)]
Merge "DO NOT MERGE ANYWHERE Improve logging in BluetoothHeadsetClientCall." into cw-e-dev
Bryce Lee [Thu, 21 Jan 2016 22:29:42 +0000 (14:29 -0800)]
DO NOT MERGE ANYWHERE Improve logging in BluetoothHeadsetClientCall.
Change-Id: I3b1b3946ca21c0bbc902a2c521938239a486d98a
Robert Greenwalt [Thu, 21 Jan 2016 22:10:55 +0000 (22:10 +0000)]
Merge "Add free short codes for Direct Carrier Billing and others."
John Reck [Thu, 21 Jan 2016 22:08:44 +0000 (22:08 +0000)]
Merge "libhwui: fix texture memory leak"
am:
550d46d9da
* commit '
550d46d9dae8a4de5abd36a5e2d3c101135da696':
libhwui: fix texture memory leak
John Reck [Thu, 21 Jan 2016 21:48:24 +0000 (21:48 +0000)]
Merge "libhwui: fix texture memory leak"
Lorenzo Colitti [Thu, 21 Jan 2016 19:04:57 +0000 (04:04 +0900)]
Debug logging for when getActiveNetworkInfo returns BLOCKED.
Bug:
26488100
Change-Id: I991581732d35aed18392bed2f3d69ca8fb231f5e
Matthew Williams [Thu, 21 Jan 2016 19:25:51 +0000 (19:25 +0000)]
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
Matthew Williams [Thu, 21 Jan 2016 19:20:31 +0000 (19:20 +0000)]
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
Matthew Williams [Thu, 21 Jan 2016 19:13:32 +0000 (19:13 +0000)]
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
Matthew Williams [Thu, 21 Jan 2016 19:08:07 +0000 (19:08 +0000)]
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
Matthew Williams [Thu, 21 Jan 2016 19:01:02 +0000 (19:01 +0000)]
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
Matthew Williams [Thu, 21 Jan 2016 18:54:44 +0000 (18:54 +0000)]
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
Matthew Williams [Thu, 21 Jan 2016 18:48:55 +0000 (18:48 +0000)]
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
Matthew Williams [Thu, 21 Jan 2016 18:41:55 +0000 (18:41 +0000)]
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
Matthew Williams [Thu, 21 Jan 2016 18:37:01 +0000 (18:37 +0000)]
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
Matthew Williams [Thu, 21 Jan 2016 18:29:33 +0000 (18:29 +0000)]
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
Matthew Williams [Thu, 21 Jan 2016 18:19:53 +0000 (18:19 +0000)]
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
Matthew Williams [Thu, 21 Jan 2016 18:14:32 +0000 (18:14 +0000)]
DO NOT MERGE Redact Account info from getCurrentSyncs am:
a5cafd2a93
am:
06ef7dfdf0
* commit '
06ef7dfdf0a3efb44326228c55309ec6df134376':
DO NOT MERGE Redact Account info from getCurrentSyncs
Matthew Williams [Thu, 21 Jan 2016 18:07:55 +0000 (18:07 +0000)]
DO NOT MERGE Redact Account info from getCurrentSyncs
am:
a5cafd2a93
* commit '
a5cafd2a93ce1c481328e2ce25c3bf2a19b81601':
DO NOT MERGE Redact Account info from getCurrentSyncs
Sergio Giro [Thu, 21 Jan 2016 17:20:41 +0000 (17:20 +0000)]
Merge "org.apache.conn.ssl: rename DistinguishedNameParser to AndroidDistinguishedNameParser"
am:
eb93182dfb
* commit '
eb93182dfb862df27e479d30c7b8e12f13e5def5':
org.apache.conn.ssl: rename DistinguishedNameParser to AndroidDistinguishedNameParser
Sergio Giro [Thu, 21 Jan 2016 17:08:21 +0000 (17:08 +0000)]
Merge "org.apache.conn.ssl: rename DistinguishedNameParser to AndroidDistinguishedNameParser"
Sergio Giro [Thu, 21 Jan 2016 15:25:01 +0000 (15:25 +0000)]
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
Matthew Williams [Tue, 19 Jan 2016 23:04:04 +0000 (23:04 +0000)]
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)
Jorim Jaggi [Thu, 21 Jan 2016 05:38:53 +0000 (05:38 +0000)]
Fix SystemUI animator leak am:
3c988197fa
am:
7a1c656269
* commit '
7a1c6562694faaee4bf30a3b06573e96e93034ff':
Fix SystemUI animator leak
Jorim Jaggi [Thu, 21 Jan 2016 05:34:13 +0000 (05:34 +0000)]
Fix SystemUI animator leak
am:
3c988197fa
* commit '
3c988197fac989e4cca7fd1a96f6489e8ed4a05b':
Fix SystemUI animator leak
Dohyun Lee [Thu, 21 Jan 2016 04:46:21 +0000 (13:46 +0900)]
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>
Jorim Jaggi [Wed, 20 Jan 2016 00:32:17 +0000 (16:32 -0800)]
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
Chenjie Luo [Thu, 21 Jan 2016 00:33:46 +0000 (00:33 +0000)]
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
Chenjie Luo [Thu, 21 Jan 2016 00:11:23 +0000 (00:11 +0000)]
Merge "Fix bug in AssetAtlas packing loop" into cw-e-dev am:
b2b2fb0182
am:
8d6f1956e4
* commit '
8d6f1956e46cefed0eaa754a468805e2e4d61972':
Fix bug in AssetAtlas packing loop
Chenjie Luo [Wed, 20 Jan 2016 23:55:34 +0000 (23:55 +0000)]
Merge "Fix bug in AssetAtlas packing loop" into cw-e-dev
am:
b2b2fb0182
* commit '
b2b2fb018243831144929b1db9db9b8eeab8d984':
Fix bug in AssetAtlas packing loop
Vasco Brito [Wed, 20 Jan 2016 23:39:23 +0000 (23:39 +0000)]
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>
Chenjie Luo [Wed, 20 Jan 2016 23:38:46 +0000 (23:38 +0000)]
Merge "Fix bug in AssetAtlas packing loop" into cw-e-dev
Chenjie Luo [Wed, 20 Jan 2016 21:25:11 +0000 (13:25 -0800)]
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
Matthew Williams [Wed, 20 Jan 2016 18:44:07 +0000 (18:44 +0000)]
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
Matthew Williams [Wed, 20 Jan 2016 18:38:50 +0000 (18:38 +0000)]
Redact Account info from getCurrentSyncs am:
f39549e389 am:
1a0aed3257 am:
0e7cd0a9fb am:
be136b7a3e am:
a947baa87c am:
0f292147f3 am:
ce3842eb1a am:
85f169d19f
am:
c77a2228aa
* commit '
c77a2228aa66a1d2b1e497c193604de0717ec3c7':
Redact Account info from getCurrentSyncs
Matthew Williams [Wed, 20 Jan 2016 18:31:19 +0000 (18:31 +0000)]
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
Matthew Williams [Wed, 20 Jan 2016 18:08:33 +0000 (18:08 +0000)]
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
Geoff Mendal [Wed, 20 Jan 2016 17:51:10 +0000 (17:51 +0000)]
Import translations. DO NOT MERGE am:
a341d639a7 -s ours
am:
79b3e943ca -s ours
* commit '
79b3e943ca244b91f397475fbf898b47ceaf1ba8':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 20 Jan 2016 17:45:43 +0000 (17:45 +0000)]
Import translations. DO NOT MERGE
am:
ce64efc199 -s ours
* commit '
ce64efc1994e7fe8a17489d7f48985b72e9f4770':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 20 Jan 2016 17:42:58 +0000 (17:42 +0000)]
Import translations. DO NOT MERGE
am:
a341d639a7 -s ours
* commit '
a341d639a7d093fb36850956cd9b3738b72ecfc2':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 20 Jan 2016 15:12:24 +0000 (10:12 -0500)]
Import translations. DO NOT MERGE
Change-Id: I3902d341ef58ad3b1d0da111d06384eb60c795ce
Auto-generated-cl: translation import
Geoff Mendal [Wed, 20 Jan 2016 14:33:02 +0000 (09:33 -0500)]
Import translations. DO NOT MERGE
Change-Id: I875bc3fe8f82fe0b29867e9d4790b2e57c4df566
Auto-generated-cl: translation import
Matthew Williams [Wed, 20 Jan 2016 11:55:52 +0000 (11:55 +0000)]
Redact Account info from getCurrentSyncs am:
f39549e389 am:
1a0aed3257 am:
0e7cd0a9fb am:
be136b7a3e am:
a947baa87c
am:
0f292147f3
* commit '
0f292147f3ac803a8701afd7362ad3e0487fd496':
Redact Account info from getCurrentSyncs
Matthew Williams [Wed, 20 Jan 2016 11:51:42 +0000 (11:51 +0000)]
Redact Account info from getCurrentSyncs am:
f39549e389 am:
1a0aed3257 am:
0e7cd0a9fb am:
be136b7a3e
am:
a947baa87c
* commit '
a947baa87caeb6733846d6de4ef2bf84f7ab0fa1':
Redact Account info from getCurrentSyncs
Matthew Williams [Wed, 20 Jan 2016 11:46:39 +0000 (11:46 +0000)]
Redact Account info from getCurrentSyncs am:
f39549e389 am:
1a0aed3257 am:
0e7cd0a9fb
am:
be136b7a3e
* commit '
be136b7a3e3f117dea283d194d1e6979fb47662b':
Redact Account info from getCurrentSyncs
Matthew Williams [Wed, 20 Jan 2016 11:41:23 +0000 (11:41 +0000)]
Redact Account info from getCurrentSyncs am:
f39549e389 am:
1a0aed3257
am:
0e7cd0a9fb
* commit '
0e7cd0a9fbdcb48c551d54627eb964364dd946d0':
Redact Account info from getCurrentSyncs
Matthew Williams [Wed, 20 Jan 2016 11:37:17 +0000 (11:37 +0000)]
Redact Account info from getCurrentSyncs am:
f39549e389
am:
1a0aed3257
* commit '
1a0aed3257ad1b8216930928090885cf4210bd87':
Redact Account info from getCurrentSyncs
Matthew Williams [Wed, 20 Jan 2016 11:32:56 +0000 (11:32 +0000)]
Redact Account info from getCurrentSyncs
am:
f39549e389
* commit '
f39549e389edf62f43bacd95a1b8580d75ad77ed':
Redact Account info from getCurrentSyncs
Sanket Agarwal [Wed, 20 Jan 2016 01:25:04 +0000 (01:25 +0000)]
Merge "Add support for AVRCP 1.3."
am:
168f2e556b
* commit '
168f2e556b7222fd0dab7eadc4ceee2eca13be1a':
Add support for AVRCP 1.3.
Sanket Agarwal [Wed, 20 Jan 2016 00:23:38 +0000 (00:23 +0000)]
Merge "Add support for AVRCP 1.3."
Matthew Williams [Tue, 19 Jan 2016 23:04:04 +0000 (23:04 +0000)]
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)
Sanket Agarwal [Thu, 22 Oct 2015 01:23:27 +0000 (18:23 -0700)]
Add support for AVRCP 1.3.
* Add metadata support.
* Add player settings support.
* Add playback support.
A2DP Settings App support.
Bluetooth: A2DP Sink support for Settings App
- add support for A2DP Sink in Settings App. This will enable connection
initiation and updation on Settings App
- add framework Apis to support A2DP Sink. Any third party Apps can access
A2DP Sink priority of device and playing state of device
- add support for key to set priority. This manages priority of device for
A2DP Sink profile
Change-Id: If5f9139f37cdb9d200387877c7801075205c78a0
Doris Liu [Tue, 19 Jan 2016 20:15:14 +0000 (20:15 +0000)]
Merge "Revert "Get animation update timing for AVD"" into mnc-dr1.5-dev am:
a466e15223
am:
22116275aa
* commit '
22116275aa2b7184c65b14c3e92455d76d3c67d4':
Revert "Get animation update timing for AVD"
Doris Liu [Tue, 19 Jan 2016 20:04:36 +0000 (20:04 +0000)]
Merge "Revert "Get animation update timing for AVD"" into mnc-dr1.5-dev
am:
a466e15223
* commit '
a466e15223ad64c5ae5d81e51f571fc45f606920':
Revert "Get animation update timing for AVD"
Doris Liu [Tue, 19 Jan 2016 19:59:53 +0000 (19:59 +0000)]
Merge "Revert "Get animation update timing for AVD"" into mnc-dr1.5-dev
Doris Liu [Tue, 19 Jan 2016 19:50:18 +0000 (19:50 +0000)]
Revert "Get animation update timing for AVD"
This reverts commit
fc8e3cb768b7dfd7c0ed0fb93dd9d735887e8d45.
Bug:
26616870
Change-Id: I2f018cb34f014f4ebb635e18cd940997507a4a4d
John Reck [Tue, 19 Jan 2016 18:38:11 +0000 (18:38 +0000)]
Merge "fix race condition between HWUI cache and renderThread"
am:
2c2b5e8514
* commit '
2c2b5e8514247d8524778d209f26b7dbde19d142':
fix race condition between HWUI cache and renderThread
John Reck [Tue, 19 Jan 2016 18:29:30 +0000 (18:29 +0000)]
Merge "fix race condition between HWUI cache and renderThread"
Thomas Buhot [Mon, 18 Jan 2016 09:31:58 +0000 (10:31 +0100)]
fix race condition between HWUI cache and renderThread
getMaximumBitmapWidth() and getMaximumBitmapHeight() of DisplayListCanvas
need HWUI cache instance. Since the initialization of the cache is
asynchronous it may crash if not yet ready. Add a staticFence() call
to guarantee the cache has been created prior issuing the call.
Change-Id: I5ed9e5cc084444c8d1872a77fef50e294ae14e93
Signed-off-by: Thomas Buhot <thomas.buhot@intel.com>
Signed-off-by: Zhiquan Liu <zhiquan.liu@intel.com>
Geoff Mendal [Mon, 18 Jan 2016 15:26:34 +0000 (15:26 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr2-dev
am:
7819c3b859 -s ours
* commit '
7819c3b8591035426eb9b5706f816a95644422ea':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 18 Jan 2016 15:23:52 +0000 (15:23 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr2-dev
Geoff Mendal [Mon, 18 Jan 2016 15:19:19 +0000 (10:19 -0500)]
Import translations. DO NOT MERGE
Change-Id: I581155468832227ff209fc60743a2735b34f91a2
Auto-generated-cl: translation import
Geoff Mendal [Mon, 18 Jan 2016 14:51:47 +0000 (14:51 +0000)]
Import translations. DO NOT MERGE am:
6168c078ae -s ours
am:
0745fe8db2 -s ours
* commit '
0745fe8db2fc6d8fd2b4d3f57b769ae5bf0f3a0a':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 18 Jan 2016 14:47:10 +0000 (14:47 +0000)]
Import translations. DO NOT MERGE
am:
6168c078ae -s ours
* commit '
6168c078aebc9cc3a371fb1165681c3b40e1b2f0':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 18 Jan 2016 14:41:08 +0000 (09:41 -0500)]
Import translations. DO NOT MERGE
Change-Id: I0ff7336ca90107f45266090de0ffc634daa54722
Auto-generated-cl: translation import
Thierry Strudel [Fri, 15 Jan 2016 23:51:19 +0000 (23:51 +0000)]
Merge "Supply content description for QS disconnect buttons" into mnc-dr1.5-dev am:
fc7e682f44
am:
f4dd31755a
* commit '
f4dd31755a31a2eea6e363a1ab45a4a8634e27ed':
Supply content description for QS disconnect buttons
Thierry Strudel [Fri, 15 Jan 2016 23:47:53 +0000 (23:47 +0000)]
Merge "Supply content description for QS disconnect buttons" into mnc-dr1.5-dev
am:
fc7e682f44
* commit '
fc7e682f445fbf358e59205912229b63c5fadda4':
Supply content description for QS disconnect buttons
Thierry Strudel [Fri, 15 Jan 2016 23:44:45 +0000 (23:44 +0000)]
Merge "Supply content description for QS disconnect buttons" into mnc-dr1.5-dev
Daniel Sandler [Fri, 15 Jan 2016 21:18:20 +0000 (21:18 +0000)]
Merge "Stop leaking Notifications when they change groupKeys." into mnc-dr1.5-dev am:
76f28bbd64
am:
3be84505f4
* commit '
3be84505f41e58125b4449f0506d518bd2f1ae95':
Stop leaking Notifications when they change groupKeys.
Daniel Sandler [Fri, 15 Jan 2016 21:14:01 +0000 (21:14 +0000)]
Merge "Stop leaking Notifications when they change groupKeys." into mnc-dr1.5-dev
am:
76f28bbd64
* commit '
76f28bbd64a6841a91d4890d7a248411fd95b149':
Stop leaking Notifications when they change groupKeys.
Daniel Sandler [Fri, 15 Jan 2016 21:05:41 +0000 (21:05 +0000)]
Merge "Stop leaking Notifications when they change groupKeys." into mnc-dr1.5-dev
Dan Albert [Fri, 15 Jan 2016 21:02:29 +0000 (21:02 +0000)]
Merge "Make the appropriate cast to protect from mingw."
am:
dbf8c17bd2
* commit '
dbf8c17bd20c3c5b4ba99242afa8b714841914d1':
Make the appropriate cast to protect from mingw.
Dan Albert [Fri, 15 Jan 2016 20:41:23 +0000 (20:41 +0000)]
Merge "Make the appropriate cast to protect from mingw."
OSDN Git Service
