OSDN Git Service
Geoff Mendal [Tue, 2 Feb 2016 23:49:05 +0000 (05:19 +0530)]
Import translations. DO NOT MERGE
Change-Id: Ia5f398b681822bea28cdda74811bd413da9f3c86
Auto-generated-cl: translation import
Geoff Mendal [Mon, 1 Feb 2016 23:30:56 +0000 (23:30 +0000)]
Import translations. DO NOT MERGE am:
73ecaf0881 -s ours am:
94d9f3c788 -s ours
am:
5aec202998 -s ours
* commit '
5aec202998dfc1f72159b25892358c9f477d35f5':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 1 Feb 2016 23:26:05 +0000 (23:26 +0000)]
Import translations. DO NOT MERGE am:
73ecaf0881 -s ours
am:
94d9f3c788 -s ours
* commit '
94d9f3c78856217a1d7c6444fb7f9bc47ce96adc':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 1 Feb 2016 23:21:45 +0000 (23:21 +0000)]
Import translations. DO NOT MERGE
am:
73ecaf0881 -s ours
* commit '
73ecaf0881121522831c33563c5dcdcfda11f895':
Import translations. DO NOT MERGE
Bart Sears [Mon, 1 Feb 2016 22:23:34 +0000 (22:23 +0000)]
Merge "Hack to get devices booting again." into mnc-dr1.5-dev
am:
29700949ad
* commit '
29700949ad981bde8d35219914161f6424e7757b':
Hack to get devices booting again.
Bart Sears [Mon, 1 Feb 2016 22:17:49 +0000 (22:17 +0000)]
Merge "Hack to get devices booting again." into mnc-dr1.5-dev
Geoff Mendal [Mon, 1 Feb 2016 21:24:23 +0000 (13:24 -0800)]
Import translations. DO NOT MERGE
Change-Id: I25920d1a09b527c9e2868537f68d994a40a85e6a
Auto-generated-cl: translation import
Geoff Mendal [Mon, 1 Feb 2016 21:10:47 +0000 (21:10 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr2-dev
Geoff Mendal [Mon, 1 Feb 2016 21:08:15 +0000 (13:08 -0800)]
Import translations. DO NOT MERGE
Change-Id: I22adb9c9dea51a632471abe8623deea91ba90b25
Auto-generated-cl: translation import
Geoff Mendal [Mon, 1 Feb 2016 20:44:05 +0000 (20:44 +0000)]
Import translations. DO NOT MERGE am:
f544fc21d0 -s ours
am:
b2628caab6 -s ours
* commit '
b2628caab626bac41e551556cabf34c0770cec9b':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 1 Feb 2016 20:41:25 +0000 (20:41 +0000)]
Import translations. DO NOT MERGE
am:
f544fc21d0 -s ours
* commit '
f544fc21d0a4d74a13e385d981a805f8add8cebb':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 1 Feb 2016 20:37:44 +0000 (12:37 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ic5942cf8f289103e9a78b93e69211bf17a47b344
Auto-generated-cl: translation import
Geoff Mendal [Mon, 1 Feb 2016 20:26:24 +0000 (20:26 +0000)]
Import translations. DO NOT MERGE
am:
9ff5be7674 -s ours
* commit '
9ff5be7674e3a925dc371bc812b220f3c476c501':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 1 Feb 2016 20:21:06 +0000 (12:21 -0800)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
26887782
Change-Id: If6bc1bd3f277f0289aecb7c063f899363079c248
Jeff Sharkey [Fri, 29 Jan 2016 17:45:45 +0000 (10:45 -0700)]
Hack to get devices booting again.
If we try scheduling a pass before the system is ready, record a
pending event and dispatch once we're actually ready.
Bug:
26863668
Change-Id: I028285383c8bbe8b653aeaa7544eefe3d41277bc
(cherry picked from commit
538c11cf2175d4e30337e8776401bfede85866be)
Adam Lesinski [Thu, 28 Jan 2016 19:24:44 +0000 (19:24 +0000)]
Merge "Don\'t change screen on time on time changes" into mnc-dr1.5-dev
am:
c46f6db46e
* commit '
c46f6db46ed5474fbe8312a1229b59debbbae994':
Don't change screen on time on time changes
Adam Lesinski [Thu, 28 Jan 2016 19:20:49 +0000 (19:20 +0000)]
Merge "Don't change screen on time on time changes" into mnc-dr1.5-dev
Adam Lesinski [Wed, 27 Jan 2016 02:18:19 +0000 (18:18 -0800)]
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
Joe LaPenna [Thu, 28 Jan 2016 01:12:36 +0000 (01:12 +0000)]
[DO NOT MERGE ANYWHERE]: Allow button events in ambient. am:
7528f57c4d -s ours
am:
2bccc45cec -s ours
* commit '
2bccc45cec5201c5b613134ebb0b398bc45483ef':
[DO NOT MERGE ANYWHERE]: Allow button events in ambient.
Joe LaPenna [Thu, 28 Jan 2016 01:06:28 +0000 (01:06 +0000)]
[DO NOT MERGE ANYWHERE]: Allow button events in ambient.
am:
7528f57c4d -s ours
* commit '
7528f57c4ddbde1c6d0a2a352bd8a1af43711013':
[DO NOT MERGE ANYWHERE]: Allow button events in ambient.
Joe LaPenna [Fri, 22 Jan 2016 15:11:49 +0000 (07:11 -0800)]
[DO NOT MERGE ANYWHERE]: Allow button events in ambient.
See thread: "key presses & Ambient"
BUG:
25964771
BUG:
26524301
Change-Id: I914edd447c38678a06d27677be4597c0ee384635
Nick Vaccaro [Tue, 26 Jan 2016 20:21:37 +0000 (20:21 +0000)]
Merge "[DO NOT MERGE ANYWHERE] Fix bodysensor permission" into cw-e-dev am:
907108ca0f -s ours
am:
3e413dfcdd -s ours
* commit '
3e413dfcddf27f1a44012e4c1d2b80bdcacd1e26':
[DO NOT MERGE ANYWHERE] Fix bodysensor permission
Nick Vaccaro [Tue, 26 Jan 2016 20:16:15 +0000 (20:16 +0000)]
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
Nick Vaccaro [Tue, 26 Jan 2016 20:13:26 +0000 (20:13 +0000)]
Merge "[DO NOT MERGE ANYWHERE] Fix bodysensor permission" into cw-e-dev
Peng Xu [Fri, 22 Jan 2016 08:44:28 +0000 (00:44 -0800)]
[DO NOT MERGE ANYWHERE] Fix bodysensor permission
Bug:
26481493
Bug:
26447970
Change-Id: Ibeaf5a5e39f0dc552cf115d2834a1ec28ecef5ab
Wei Liu [Tue, 26 Jan 2016 01:57:31 +0000 (01:57 +0000)]
Add a null check before reference networkInfo. am:
b8eaf45e1d
am:
dca8f10031
* commit '
dca8f10031f33c7c85577fa1abcc26d560c90388':
Add a null check before reference networkInfo.
Wei Liu [Tue, 26 Jan 2016 01:52:12 +0000 (01:52 +0000)]
Add a null check before reference networkInfo.
am:
b8eaf45e1d
* commit '
b8eaf45e1df007fc4f5a11bb58491abaef39cd57':
Add a null check before reference networkInfo.
Wei Liu [Mon, 25 Jan 2016 18:32:27 +0000 (10:32 -0800)]
Add a null check before reference networkInfo.
b/
26758858
Change-Id: If335ece223114dbfb6b08391f18a09467f377cf1
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:51:34 +0000 (20:51 +0000)]
Check apps idle states on time changes
am:
c465e71cdc
* commit '
c465e71cdc401e1565c29a895a5c6d366ba5344c':
Check apps idle states on time changes
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
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 [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.
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
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: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
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:34:13 +0000 (05:34 +0000)]
Fix SystemUI animator leak
am:
3c988197fa
* commit '
3c988197fac989e4cca7fd1a96f6489e8ed4a05b':
Fix SystemUI animator leak
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: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
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: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: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
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)
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
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: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: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: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 Sandler [Thu, 14 Jan 2016 20:49:36 +0000 (15:49 -0500)]
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
Ian Pedowitz [Thu, 14 Jan 2016 22:21:37 +0000 (22:21 +0000)]
Merge "DO NOT MERGE Fix for syncs being dropped when appIdle is on" into mnc-dr1.5-dev
am:
33001945a8
* commit '
33001945a82ba8cd5b5ad27b808312aa2ef210af':
DO NOT MERGE Fix for syncs being dropped when appIdle is on
Ian Pedowitz [Thu, 14 Jan 2016 22:18:32 +0000 (22:18 +0000)]
Merge "DO NOT MERGE Fix for syncs being dropped when appIdle is on" into mnc-dr1.5-dev
Alan Viverette [Thu, 14 Jan 2016 21:44:31 +0000 (21:44 +0000)]
Don\'t verify the scrollbar drawable
am:
a53c3b2197
* commit '
a53c3b2197b73d5b6a697ae2077e04065df84d9e':
Don't verify the scrollbar drawable
Alan Viverette [Thu, 14 Jan 2016 21:06:36 +0000 (16:06 -0500)]
Don't verify the scrollbar drawable
Avoids infinite invalidations caused by re-use of scrollbar drawable
during a single draw() pass. Does not address the general problem of
drawable reuse causing unnecessary invalidations as a result of calls
to setBounds() invoking invalidateSelf().
Bug:
26533725
Change-Id: I99e9c2dfe4ddfc833569e40e7268dcb03e931fc9
Dan Sandler [Thu, 14 Jan 2016 16:33:54 +0000 (11:33 -0500)]
Supply content description for QS disconnect buttons
Bug:
26555270
Change-Id: I3803c7ad78a64894eca5c36f5d9ecf7fc4a6ad92
Shreyas Basarge [Mon, 11 Jan 2016 15:43:54 +0000 (15:43 +0000)]
DO NOT MERGE Fix for syncs being dropped when appIdle is on
Syncs were being dropped when appIdleMode was on for
an app. This CL backs off the sync instead of dropping
it. When the app becomes non-idle, backoff is cleared
and the sync is performed.
Bug:
26355386
Change-Id: I2040dfd847011d3ca902e66a8cd52b2a429177c1
Justin Harrison [Thu, 14 Jan 2016 06:44:21 +0000 (06:44 +0000)]
Merge "Fix race condition when setting default ringtones" into mnc-dr1.5-dev
am:
e41a6c8b19
* commit '
e41a6c8b19482a05a98e77d13281f7f14056f119':
Fix race condition when setting default ringtones
Justin Harrison [Thu, 14 Jan 2016 06:42:20 +0000 (06:42 +0000)]
Merge "Fix race condition when setting default ringtones" into mnc-dr1.5-dev
Amit Mahajan [Thu, 14 Jan 2016 06:33:00 +0000 (06:33 +0000)]
Merge "Allow turning off Wi-Fi when emergency call is made [DO NOT MERGE]" into mnc-dr1.5-dev
am:
c6c9b2aa66
* commit '
c6c9b2aa66635761b5cebc2faf9e06631c36eab5':
Allow turning off Wi-Fi when emergency call is made [DO NOT MERGE]
Amit Mahajan [Thu, 14 Jan 2016 06:30:15 +0000 (06:30 +0000)]
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
Amit Mahajan [Thu, 14 Jan 2016 06:28:47 +0000 (06:28 +0000)]
Merge "Allow turning off Wi-Fi when emergency call is made [DO NOT MERGE]" into mnc-dr1.5-dev
Amit Mahajan [Thu, 14 Jan 2016 06:26:26 +0000 (06:26 +0000)]
Merge "DO NOT MERGE Adding new intent for EMERGENCY_CALL_STATE_CHANGE" into mnc-dr1.5-dev
Chenjie Luo [Thu, 14 Jan 2016 02:29:13 +0000 (02:29 +0000)]
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
Vinit Deshpande [Thu, 14 Jan 2016 00:58:30 +0000 (16:58 -0800)]
Allow turning off Wi-Fi when emergency call is made [DO NOT MERGE]
Bug:
24147407
Change-Id: Ia07b8bc4ccbdaeea18ed22fbfcf813f71ddfa7dc
Chenjie Luo [Thu, 14 Jan 2016 02:24:48 +0000 (02:24 +0000)]
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
Chenjie Luo [Thu, 14 Jan 2016 02:22:15 +0000 (02:22 +0000)]
Merge "Add STEM_1, STEM_2 and STEM_3 key as wakeup keys" into cw-e-dev
OSDN Git Service
