OSDN Git Service
Joshua Schwarz [Thu, 25 Feb 2016 22:45:20 +0000 (22:45 +0000)]
Merge "Add Google Now intent so that it is discoverable to AppLaunch metrics." into cw-e-dev
Joshua Schwarz [Wed, 24 Feb 2016 01:26:25 +0000 (17:26 -0800)]
Add Google Now intent so that it is discoverable to AppLaunch metrics.
Change-Id: I65ddce1499c3fa2ca54b815709270610a273e571
Andre Eisenbach [Wed, 24 Feb 2016 19:36:27 +0000 (11:36 -0800)]
resolve merge conflicts of
e6c7c8e8f2 to cw-e-dev
Change-Id: I94683e571a73df721206d7e5fc14cb817ec9620f
Andre Eisenbach [Wed, 24 Feb 2016 18:35:37 +0000 (18:35 +0000)]
Merge "DO NOT MERGE Read Bluetooth interop database entries from settings (1/2)" into mnc-dr-dev
Liejun Tao [Tue, 23 Feb 2016 21:54:00 +0000 (21:54 +0000)]
DO NOT MERGE Bluetooth: Restrict gain for Absolute volume case
am:
9ef7634fa9
* commit '
9ef7634fa9b4e9cf9ea9380aee8b7dfd71f24b57':
DO NOT MERGE Bluetooth: Restrict gain for Absolute volume case
Andre Eisenbach [Thu, 14 Jan 2016 22:20:34 +0000 (14:20 -0800)]
DO NOT MERGE Read Bluetooth interop database entries from settings (1/2)
Interop database entries are stored in the system settings entry
"BluetoothInteropDatabase". The format is a list of entries separated by
";". An entry consists of a BDA fragment, followed by a comma and an
integer representing a feature from interop.h.
Example:
To disable LE secure connections for devices starting with BDA 11:22:33,
use "11:22:33,0".
Bug:
26548845
Change-Id: I6a9fd34f6af4d3bdfcaa0e051eafebdfbf2a4949
(cherry picked from commit
3bc623be8dd8b83d0a22c5cc5b5a8955001f6fc7)
Liejun Tao [Wed, 20 Jan 2016 23:52:20 +0000 (17:52 -0600)]
DO NOT MERGE Bluetooth: Restrict gain for Absolute volume case
For the lowest music volume steps 1 and 2, restrict the gain to 50% and
75%. This will avoid the lowest volume steps being too loud for some
accessories. For music volume 0, set phone gain to 0 as some
accessories won't mute on their end.
Change-Id: I24e0fa7be8c8635b428a11c91ea153aad7cec55f
Signed-off-by: Liejun Tao <baibai@motorola.com>
Akshay Thakker [Mon, 22 Feb 2016 22:39:53 +0000 (22:39 +0000)]
Merge "DO NOT MERGE Fix for syncs being dropped when appIdle is on" into mnc-dr-dev
am:
e210c99809
* commit '
e210c9980946b440bc6f7d57fef18c7fac223d3a':
DO NOT MERGE Fix for syncs being dropped when appIdle is on
Akshay Thakker [Mon, 22 Feb 2016 22:27:24 +0000 (22:27 +0000)]
Merge "DO NOT MERGE Fix for syncs being dropped when appIdle is on" into mnc-dr-dev
Adam Lesinski [Mon, 22 Feb 2016 19:31:32 +0000 (19:31 +0000)]
Merge "DO NOT MERGE ANYWHERE: Hack to get devices booting again." into mnc-dr-dev
am:
d201f48687 -s ours
* commit '
d201f486871e825e713ae0df2f2f01e3dfff94d8':
DO NOT MERGE ANYWHERE: Hack to get devices booting again.
Adam Lesinski [Mon, 22 Feb 2016 19:27:18 +0000 (19:27 +0000)]
Merge "DO NOT MERGE ANYWHERE: Don\'t change screen on time on time changes" into mnc-dr-dev
am:
3e439db8c8 -s ours
* commit '
3e439db8c829023645a54eee4cd531928bccb03d':
DO NOT MERGE ANYWHERE: Don't change screen on time on time changes
Adam Lesinski [Mon, 22 Feb 2016 18:47:11 +0000 (18:47 +0000)]
Merge "DO NOT MERGE ANYWHERE: Hack to get devices booting again." into mnc-dr-dev
Adam Lesinski [Mon, 22 Feb 2016 18:47:02 +0000 (18:47 +0000)]
Merge "DO NOT MERGE ANYWHERE: Don't change screen on time on time changes" into mnc-dr-dev
Shreyas Basarge [Sat, 20 Feb 2016 02:14:27 +0000 (02:14 +0000)]
NPE fix for SyncStorageEngine read authority am:
a962d9eba7 am:
339c4f2b05 am:
58048c1f17 am:
eec587edf1 am:
6fc321a66d am:
5e4e02b009 am:
242bdb6d5b am:
4aa78554df am:
20339172bd
am:
20c518816a
* commit '
20c518816a0946dff67a3b99b929bc30c9b0ad6c':
NPE fix for SyncStorageEngine read authority
Shreyas Basarge [Sat, 20 Feb 2016 02:05:16 +0000 (02:05 +0000)]
NPE fix for SyncStorageEngine read authority am:
a962d9eba7 am:
339c4f2b05 am:
58048c1f17 am:
eec587edf1 am:
6fc321a66d am:
5e4e02b009 am:
242bdb6d5b am:
4aa78554df
am:
20339172bd
* commit '
20339172bddac09730bf46f5eb289db4c299d64d':
NPE fix for SyncStorageEngine read authority
Shreyas Basarge [Sat, 20 Feb 2016 02:01:11 +0000 (02:01 +0000)]
NPE fix for SyncStorageEngine read authority am:
a962d9eba7 am:
339c4f2b05 am:
58048c1f17 am:
eec587edf1 am:
6fc321a66d am:
5e4e02b009 am:
242bdb6d5b
am:
4aa78554df
* commit '
4aa78554dfa1ff4cdb91ba560e3097d8febbe5c9':
NPE fix for SyncStorageEngine read authority
Shreyas Basarge [Sat, 20 Feb 2016 01:53:57 +0000 (01:53 +0000)]
NPE fix for SyncStorageEngine read authority am:
a962d9eba7 am:
339c4f2b05 am:
58048c1f17 am:
eec587edf1 am:
6fc321a66d am:
5e4e02b009
am:
242bdb6d5b
* commit '
242bdb6d5bec6e42b7caf42fd08ded0accc70fb8':
NPE fix for SyncStorageEngine read authority
Shreyas Basarge [Sat, 20 Feb 2016 01:45:01 +0000 (01:45 +0000)]
NPE fix for SyncStorageEngine read authority am:
a962d9eba7 am:
339c4f2b05 am:
58048c1f17 am:
eec587edf1 am:
6fc321a66d
am:
5e4e02b009
* commit '
5e4e02b00999db4513f43d5ddfdd2c71212cc503':
NPE fix for SyncStorageEngine read authority
Shreyas Basarge [Sat, 20 Feb 2016 01:37:34 +0000 (01:37 +0000)]
NPE fix for SyncStorageEngine read authority am:
a962d9eba7 am:
339c4f2b05 am:
58048c1f17 am:
eec587edf1
am:
6fc321a66d
* commit '
6fc321a66d74401e00b2203817f75e29a0426ab7':
NPE fix for SyncStorageEngine read authority
Shreyas Basarge [Sat, 20 Feb 2016 01:27:25 +0000 (01:27 +0000)]
NPE fix for SyncStorageEngine read authority am:
a962d9eba7 am:
339c4f2b05 am:
58048c1f17
am:
eec587edf1
* commit '
eec587edf1fb4e7bc5f38695f478f191dee1e2d4':
NPE fix for SyncStorageEngine read authority
Shreyas Basarge [Sat, 20 Feb 2016 01:01:10 +0000 (01:01 +0000)]
NPE fix for SyncStorageEngine read authority am:
a962d9eba7 am:
339c4f2b05
am:
58048c1f17
* commit '
58048c1f17d54166c6a048af2365d17dd32f4d57':
NPE fix for SyncStorageEngine read authority
Shreyas Basarge [Sat, 20 Feb 2016 00:47:41 +0000 (00:47 +0000)]
NPE fix for SyncStorageEngine read authority am:
a962d9eba7
am:
339c4f2b05
* commit '
339c4f2b055d40acea280a2d4b6c83c17f86a8b5':
NPE fix for SyncStorageEngine read authority
Shreyas Basarge [Sat, 20 Feb 2016 00:41:03 +0000 (00:41 +0000)]
NPE fix for SyncStorageEngine read authority
am:
a962d9eba7
* commit '
a962d9eba7a8f741ed149964126fb08fe4fd7128':
NPE fix for SyncStorageEngine read authority
Shreyas Basarge [Thu, 18 Feb 2016 11:56:05 +0000 (11:56 +0000)]
NPE fix for SyncStorageEngine read authority
Add a null check after an authority is read
from disk.
Bug:
26513719
Change-Id: I18f01828141110e776cc96f3b3be3d80125e70c1
Jeff Sharkey [Fri, 29 Jan 2016 17:45:45 +0000 (10:45 -0700)]
DO NOT MERGE ANYWHERE: 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 [Wed, 27 Jan 2016 02:18:19 +0000 (18:18 -0800)]
DO NOT MERGE ANYWHERE: 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
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
(cherry picked from commit
2c051498b2b0e2608740d906e70867b74083107d)
Amith Yamasani [Thu, 18 Feb 2016 20:16:55 +0000 (20:16 +0000)]
Merge "DO NOT MERGE Check apps idle states on time changes" into mnc-dr-dev
am:
7a313a63ca
* commit '
7a313a63cac7ae79699a6ea928af92429edd479b':
DO NOT MERGE Check apps idle states on time changes
Amith Yamasani [Thu, 18 Feb 2016 20:09:23 +0000 (20:09 +0000)]
Merge "DO NOT MERGE Check apps idle states on time changes" into mnc-dr-dev
Adam Lesinski [Thu, 18 Feb 2016 19:20:22 +0000 (19:20 +0000)]
DO NOT MERGE ANYWHERE: UsageStats: Use new settings key idle_duration2 for app idle
am:
1559fed4c4 -s ours
* commit '
1559fed4c47a4bd219e61f7d34e50d46b8929f8a':
DO NOT MERGE ANYWHERE: UsageStats: Use new settings key idle_duration2 for app idle
Adam Lesinski [Thu, 18 Feb 2016 19:17:39 +0000 (19:17 +0000)]
DO NOT MERGE ANYWHERE: UsageStats: Fix issue where initializing data for first time would cause crash
am:
2bd90c6abc -s ours
* commit '
2bd90c6abce3e43af6db4eaa7a34459e8341b3a0':
DO NOT MERGE ANYWHERE: UsageStats: Fix issue where initializing data for first time would cause crash
Adam Lesinski [Thu, 18 Feb 2016 19:15:16 +0000 (19:15 +0000)]
DO NOT MERGE ANYWHERE: UsageStatsService: Fix app idle issue at rollover time
am:
9c7b543325 -s ours
* commit '
9c7b543325db1a6f8913403ec3a5cbe041b25043':
DO NOT MERGE ANYWHERE: UsageStatsService: Fix app idle issue at rollover time
Amith Yamasani [Fri, 22 Jan 2016 19:27:16 +0000 (11:27 -0800)]
DO NOT MERGE 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
(cherry picked from commit
c465e71cdc401e1565c29a895a5c6d366ba5344c)
Adam Lesinski [Wed, 13 Jan 2016 20:26:07 +0000 (12:26 -0800)]
DO NOT MERGE ANYWHERE: 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
Adam Lesinski [Tue, 12 Jan 2016 18:36:09 +0000 (10:36 -0800)]
DO NOT MERGE ANYWHERE: 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
Adam Lesinski [Fri, 8 Jan 2016 02:24:53 +0000 (18:24 -0800)]
DO NOT MERGE ANYWHERE: UsageStatsService: Fix app idle issue at rollover time
App Idle queries are very frequent and so they only check in memory stats.
However, in memory stats can be missing some entries, especially after a rollover, but also
due to a larger bug fixed in master (too risky to take now).
The fix is to do a deep query (reading older files from disk) and maintain a parallel cache
of stats for app idle. That way the rolling window of data required to serve app idle queries
stays in memory.
Bug:
26355386
Change-Id: I6a29bbc25214f6a3c2f24c8c079936e66f99e42e
Akshay Thakker [Sun, 14 Feb 2016 22:30:47 +0000 (22:30 +0000)]
Merge "Fix missing observer reply callbacks" into mnc-dr-dev
am:
d1811e07d5
* commit '
d1811e07d5ee751cbdc37a3ff84e2e010ead7adf':
Fix missing observer reply callbacks
Akshay Thakker [Sun, 14 Feb 2016 22:27:20 +0000 (22:27 +0000)]
Merge "Exit getAllValidScorers early if not the primary." into mnc-dr-dev
am:
ae31e13ae8
* commit '
ae31e13ae8785c627ac781a565fa41bc982cfb99':
Exit getAllValidScorers early if not the primary.
Dan Sandler [Sun, 14 Feb 2016 22:25:09 +0000 (22:25 +0000)]
DO NOT MERGE: Use GregorianCalendar.add() when searching for next alarm.
am:
e79c73d626
* commit '
e79c73d6267681dbbc8bd4eccf9a79e3017f6fe9':
DO NOT MERGE: Use GregorianCalendar.add() when searching for next alarm.
Akshay Thakker [Sun, 14 Feb 2016 22:23:53 +0000 (22:23 +0000)]
Merge "Fix missing observer reply callbacks" into mnc-dr-dev
Akshay Thakker [Sun, 14 Feb 2016 22:17:31 +0000 (22:17 +0000)]
Merge "Exit getAllValidScorers early if not the primary." into mnc-dr-dev
Amith Yamasani [Fri, 20 Nov 2015 17:44:08 +0000 (09:44 -0800)]
Fix missing observer reply callbacks
This was causing upto 2 seconds in user switching delay.
Bug:
25813588
Change-Id: Icf23b021f134a8ccfa2dae470af02b2da7454acc
Jeremy Joslin [Fri, 18 Dec 2015 01:38:04 +0000 (17:38 -0800)]
Exit getAllValidScorers early if not the primary.
This fixes the crash that occurs when getAllValidScorers() is invoked by
a non-primary user when a scorer is active.
BUG:
23040221
Change-Id: I42c9e18d74389be3191258ca5626f2c433ca7cc7
(cherry picked from commit
5b294b45d0d7afbed71fd2e59342c5ad7b8b7d76)
Dan Sandler [Tue, 29 Dec 2015 20:45:39 +0000 (15:45 -0500)]
DO NOT MERGE: Use GregorianCalendar.add() when searching for next alarm.
Never attribute to malice that which is adequately explained
by a bug, particularly one involving date math.
Bug:
26326394
Change-Id: I3483ac102c678a8852565c8ea94c06e19b3f26d8
(cherry picked from commit
8d9aea8a1870ad83d9eccba1068a1685da5e96d0)
Hall Liu [Thu, 11 Feb 2016 18:10:31 +0000 (18:10 +0000)]
Merge "Initialize MD5 in logging in background" into cw-e-dev
Wei Liu [Thu, 4 Feb 2016 18:23:59 +0000 (18:23 +0000)]
Merge "DO NOT MERGE ANYWHERE Put the start of RttService behind a flag." into cw-e-dev
Wei Liu [Thu, 4 Feb 2016 18:01:45 +0000 (18:01 +0000)]
Merge "DO NOT MERGE ANYWHERE Start the FingnerprintService only if it has FEATURE_FINGERPRINT." into cw-e-dev
Wei Liu [Thu, 4 Feb 2016 00:57:31 +0000 (16:57 -0800)]
DO NOT MERGE ANYWHERE Put the start of RttService behind a flag.
We can set config.disable_rtt in the init script to disable the
RttService.
b/
26877020
Change-Id: Ifb7fedc4764329dc09cae41f06bf6d5fc7426e5f
Wei Liu [Wed, 3 Feb 2016 22:31:37 +0000 (14:31 -0800)]
DO NOT MERGE ANYWHERE Start the FingnerprintService only if it has FEATURE_FINGERPRINT.
b/
26877020
Change-Id: Idfef31edb7e67ae60c1b2205df326ed1c5657618
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
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 20:37:44 +0000 (12:37 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ic5942cf8f289103e9a78b93e69211bf17a47b344
Auto-generated-cl: translation import
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: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 [Mon, 25 Jan 2016 18:32:27 +0000 (10:32 -0800)]
Add a null check before reference networkInfo.
b/
26758858
Change-Id: If335ece223114dbfb6b08391f18a09467f377cf1
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
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)
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: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
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)
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
Chenjie Luo [Wed, 13 Jan 2016 19:01:59 +0000 (11:01 -0800)]
Add STEM_1, STEM_2 and STEM_3 key as wakeup keys
Bug:
25860409
Change-Id: I3f525c9c8df81807d98391c70cd2d1f8c139c8f5
Nancy Zheng [Wed, 13 Jan 2016 23:23:56 +0000 (15:23 -0800)]
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
Matthew Bouyack [Tue, 12 Jan 2016 22:28:21 +0000 (22:28 +0000)]
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
Matthew Bouyack [Tue, 12 Jan 2016 20:01:48 +0000 (12:01 -0800)]
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
Hall Liu [Fri, 8 Jan 2016 01:35:54 +0000 (17:35 -0800)]
Initialize MD5 in logging in background
Use a background task to call MessageDigest.getInstance in order to
avoid a possible disk read on initialization.
Bug:
26069217
Change-Id: I0091ce012bcd811dfca0e85c21a12c54913ed919
Geoff Mendal [Mon, 11 Jan 2016 15:46:49 +0000 (15:46 +0000)]
Merge "Revert "Import translations. DO NOT MERGE"" into lmp-mr1-ub-dev am:
66841a62f1 -s ours am:
73992aee94 -s ours
am:
0663959eb7 -s ours
* commit '
0663959eb73127a49d0a72a70000f3b092adc3e6':
Revert "Import translations. DO NOT MERGE"
Geoff Mendal [Mon, 11 Jan 2016 15:42:10 +0000 (15:42 +0000)]
Merge "Revert "Import translations. DO NOT MERGE"" into lmp-mr1-ub-dev am:
66841a62f1 -s ours
am:
73992aee94 -s ours
* commit '
73992aee94ce78b8827fe05bb5537068a96c835d':
Revert "Import translations. DO NOT MERGE"
Geoff Mendal [Mon, 11 Jan 2016 15:37:27 +0000 (15:37 +0000)]
Merge "Revert "Import translations. DO NOT MERGE"" into lmp-mr1-ub-dev
am:
66841a62f1 -s ours
* commit '
66841a62f1d71eba843e69d1c8b5ca9453c5b42b':
Revert "Import translations. DO NOT MERGE"
Geoff Mendal [Mon, 11 Jan 2016 15:33:48 +0000 (15:33 +0000)]
Merge "Revert "Import translations. DO NOT MERGE"" into lmp-mr1-ub-dev
Geoff Mendal [Mon, 11 Jan 2016 15:33:28 +0000 (15:33 +0000)]
Revert "Import translations. DO NOT MERGE"
This reverts commit
a4505e926410cbf20dcd301f35f3496628cad9de.
Change-Id: I5929282b07b1df7a3d618e3be00974609cfcc5cf
Geoff Mendal [Mon, 11 Jan 2016 14:52:22 +0000 (14:52 +0000)]
Revert "Import translations. DO NOT MERGE" am:
8874f9754f -s ours am:
4df8f4abe0 -s ours am:
009fb756ec -s ours am:
b409a99ccc -s ours am:
14c37a57ea -s ours
am:
0b8de39728 -s ours
* commit '
0b8de39728014ad51ff6784a3850a3d752f715e3':
Revert "Import translations. DO NOT MERGE"
Geoff Mendal [Mon, 11 Jan 2016 14:50:39 +0000 (14:50 +0000)]
Import translations. DO NOT MERGE am:
9f9e736e0d -s ours am:
b441c6926b -s ours am:
83bf32ebe5 -s ours am:
42692affe2 -s ours am:
8ea585955c -s ours
am:
4ae777097e -s ours
* commit '
4ae777097e4242e546c0b7e477cbd0829689dff5':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 11 Jan 2016 14:45:46 +0000 (14:45 +0000)]
Revert "Import translations. DO NOT MERGE" am:
8874f9754f -s ours am:
4df8f4abe0 -s ours am:
009fb756ec -s ours am:
b409a99ccc -s ours
am:
14c37a57ea -s ours
* commit '
14c37a57eaf9fe962fe7ee9ecb33bc883ededf7b':
Revert "Import translations. DO NOT MERGE"
Geoff Mendal [Mon, 11 Jan 2016 14:41:17 +0000 (14:41 +0000)]
Revert "Import translations. DO NOT MERGE" am:
8874f9754f -s ours am:
4df8f4abe0 -s ours am:
009fb756ec -s ours
am:
b409a99ccc -s ours
* commit '
b409a99ccc0a42814f3918c689d06526c09f726b':
Revert "Import translations. DO NOT MERGE"
Geoff Mendal [Mon, 11 Jan 2016 14:36:52 +0000 (14:36 +0000)]
Revert "Import translations. DO NOT MERGE" am:
8874f9754f -s ours am:
4df8f4abe0 -s ours
am:
009fb756ec -s ours
* commit '
009fb756ecabd78e5300c619c267f2e55cfd0922':
Revert "Import translations. DO NOT MERGE"
Geoff Mendal [Mon, 11 Jan 2016 14:32:35 +0000 (14:32 +0000)]
Revert "Import translations. DO NOT MERGE" am:
8874f9754f -s ours
am:
4df8f4abe0 -s ours
* commit '
4df8f4abe076d870b0e406efcd9c2d7cb6e4c81f':
Revert "Import translations. DO NOT MERGE"
Geoff Mendal [Mon, 11 Jan 2016 14:28:57 +0000 (14:28 +0000)]
Revert "Import translations. DO NOT MERGE"
am:
8874f9754f -s ours
* commit '
8874f9754f909dafcc2c5c23109e35297263f469':
Revert "Import translations. DO NOT MERGE"
Geoff Mendal [Mon, 11 Jan 2016 14:24:19 +0000 (14:24 +0000)]
Revert "Import translations. DO NOT MERGE"
This reverts commit
9f9e736e0dc08f7fd84d3b557ee4ae8212c61be4.
Change-Id: I7164f13dedd0713b948b4f6bcf4b54aa0bdcc0c8
Geoff Mendal [Mon, 11 Jan 2016 14:22:02 +0000 (14:22 +0000)]
Revert "Import translations. DO NOT MERGE" am:
9e5fe1a7da -s ours am:
1c51eb41ee -s ours
am:
eab7785333 -s ours
* commit '
eab778533331bc25b3b201ebb9519a016a451ae4':
Revert "Import translations. DO NOT MERGE"
Geoff Mendal [Mon, 11 Jan 2016 14:16:41 +0000 (14:16 +0000)]
Import translations. DO NOT MERGE am:
9f9e736e0d -s ours am:
b441c6926b -s ours am:
83bf32ebe5 -s ours am:
42692affe2 -s ours
am:
8ea585955c -s ours
* commit '
8ea585955c8aa06daa87a6690421f73f98bb036e':
Import translations. DO NOT MERGE
OSDN Git Service
