OSDN Git Service
Joshua Schwarz [Thu, 25 Feb 2016 22:48:02 +0000 (22:48 +0000)]
Merge "Add Google Now intent so that it is discoverable to AppLaunch metrics." into cw-e-dev
am:
dcd0b05dc3
* commit '
dcd0b05dc35fb058f89a16d370bb7965b339c1c5':
Add Google Now intent so that it is discoverable to AppLaunch metrics.
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:57:07 +0000 (19:57 +0000)]
resolve merge conflicts of
e6c7c8e8f2 to cw-e-dev
am:
dfd4b8b25c
* commit '
dfd4b8b25c6454dec6d1bdc7cae4976b537fff2f':
DO NOT MERGE Read Bluetooth interop database entries from settings (1/2)
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 22:00:37 +0000 (22:00 +0000)]
DO NOT MERGE Bluetooth: Restrict gain for Absolute volume case am:
9ef7634fa9
am:
d46bd91531
* commit '
d46bd9153144f905138e0b609c3d8252a5d5505e':
DO NOT MERGE Bluetooth: Restrict gain for Absolute volume case
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:46:59 +0000 (22:46 +0000)]
Merge "DO NOT MERGE Fix for syncs being dropped when appIdle is on" into mnc-dr-dev am:
e210c99809
am:
768e1df375
* commit '
768e1df37559c580ede46574bb1c583b0705375a':
DO NOT MERGE Fix for syncs being dropped when appIdle is on
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:44:19 +0000 (19:44 +0000)]
Merge "DO NOT MERGE ANYWHERE: Hack to get devices booting again." into mnc-dr-dev am:
d201f48687 -s ours
am:
ab4d629294 -s ours
* commit '
ab4d62929412556b90f8927fb05602d2e630518c':
DO NOT MERGE ANYWHERE: Hack to get devices booting again.
Adam Lesinski [Mon, 22 Feb 2016 19:42:04 +0000 (19:42 +0000)]
Merge "DO NOT MERGE ANYWHERE: Don\'t change screen on time on time changes" into mnc-dr-dev am:
3e439db8c8 -s ours
am:
83fd156e21 -s ours
* commit '
83fd156e2173ff65fd8afdaca1ccd20fc91a5d33':
DO NOT MERGE ANYWHERE: Don't change screen on time on time changes
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:22:00 +0000 (02:22 +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
am:
7f35fa7365
* commit '
7f35fa7365b24f13f7553c452dc68f99fc7304ae':
NPE fix for SyncStorageEngine read authority
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 22:21:32 +0000 (22:21 +0000)]
Merge "DO NOT MERGE Check apps idle states on time changes" into mnc-dr-dev am:
7a313a63ca
am:
6aff10d066 -s ours
* commit '
6aff10d0662bc4c7e64a2e6d22f3606ef4dd1046':
DO NOT MERGE Check apps idle states on time changes
Adam Lesinski [Thu, 18 Feb 2016 22:03:35 +0000 (22:03 +0000)]
DO NOT MERGE ANYWHERE: UsageStats: Use new settings key idle_duration2 for app idle am:
1559fed4c4 -s ours
am:
5c9378f310 -s ours
* commit '
5c9378f310acd4ab375ed8a5d703a86522ab814c':
DO NOT MERGE ANYWHERE: UsageStats: Use new settings key idle_duration2 for app idle
Adam Lesinski [Thu, 18 Feb 2016 22:00:55 +0000 (22:00 +0000)]
DO NOT MERGE ANYWHERE: UsageStats: Fix issue where initializing data for first time would cause crash am:
2bd90c6abc -s ours
am:
bca4317a3b -s ours
* commit '
bca4317a3bbbdfdda083283d73a26e9c078c84f2':
DO NOT MERGE ANYWHERE: UsageStats: Fix issue where initializing data for first time would cause crash
Adam Lesinski [Thu, 18 Feb 2016 21:59:39 +0000 (21:59 +0000)]
DO NOT MERGE ANYWHERE: UsageStatsService: Fix app idle issue at rollover time am:
9c7b543325 -s ours
am:
7e03454985 -s ours
* commit '
7e0345498528611f538d8a5f259acc3440c1a649':
DO NOT MERGE ANYWHERE: UsageStatsService: Fix app idle issue at rollover time
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:37:55 +0000 (22:37 +0000)]
Merge "Fix missing observer reply callbacks" into mnc-dr-dev am:
d1811e07d5
am:
a3798d7a92
* commit '
a3798d7a92ecefe1117b99a2e0f5edce1644f1d0':
Fix missing observer reply callbacks
Akshay Thakker [Sun, 14 Feb 2016 22:36:51 +0000 (22:36 +0000)]
Merge "Exit getAllValidScorers early if not the primary." into mnc-dr-dev am:
ae31e13ae8
am:
eae2b8978f
* commit '
eae2b8978f8cfdedac9404bf4c653f3f9b51f6dd':
Exit getAllValidScorers early if not the primary.
Dan Sandler [Sun, 14 Feb 2016 22:35:39 +0000 (22:35 +0000)]
DO NOT MERGE: Use GregorianCalendar.add() when searching for next alarm. am:
e79c73d626
am:
4baa901205
* commit '
4baa9012058c8366d39ed9d07fee0f6da0fd6e71':
DO NOT MERGE: Use GregorianCalendar.add() when searching for next alarm.
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:16:08 +0000 (18:16 +0000)]
Merge "Initialize MD5 in logging in background" into cw-e-dev
am:
5839e7804c
* commit '
5839e7804c717f3b398fd777540e2297e8c85300':
Initialize MD5 in logging in background
Hall Liu [Thu, 11 Feb 2016 18:10:31 +0000 (18:10 +0000)]
Merge "Initialize MD5 in logging in background" into cw-e-dev
Geoff Mendal [Wed, 10 Feb 2016 14:01:06 +0000 (09:01 -0500)]
Import translations. DO NOT MERGE
Change-Id: I25a7f71ae61c1e6dc0539fc88b2cdbadb6f99eed
Auto-generated-cl: translation import
Geoff Mendal [Mon, 8 Feb 2016 14:02:38 +0000 (09:02 -0500)]
Import translations. DO NOT MERGE
Change-Id: I7356ebc23a9842b6594df301f204d79dfcd97bca
Auto-generated-cl: translation import
Wei Liu [Thu, 4 Feb 2016 18:28:10 +0000 (18:28 +0000)]
Merge "DO NOT MERGE ANYWHERE Put the start of RttService behind a flag." into cw-e-dev
am:
e2c27eede5 -s ours
* commit '
e2c27eede562241423c02d086703b12d4b3dddd3':
DO NOT MERGE ANYWHERE Put the start of RttService behind a flag.
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:05:34 +0000 (18:05 +0000)]
Merge "DO NOT MERGE ANYWHERE Start the FingnerprintService only if it has FEATURE_FINGERPRINT." into cw-e-dev
am:
fbd88d132e -s ours
* commit '
fbd88d132e3d75c9f1af607fc1ba00a6596d7406':
DO NOT MERGE ANYWHERE Start the FingnerprintService only if it has FEATURE_FINGERPRINT.
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 [Wed, 3 Feb 2016 14:57:33 +0000 (09:57 -0500)]
Import translations. DO NOT MERGE
Change-Id: I3f9c8af09874bbdb5473ffb49a49f21c2d3bc12a
Auto-generated-cl: translation import
Geoff Mendal [Tue, 2 Feb 2016 21:40:54 +0000 (21:40 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev
Geoff Mendal [Tue, 2 Feb 2016 21:40:03 +0000 (13:40 -0800)]
Import translations. DO NOT MERGE
Change-Id: I9f019cebdea7b7e4b3600f936e7913cbeffc5a63
Auto-generated-cl: translation import
Geoff Mendal [Tue, 2 Feb 2016 21:28:40 +0000 (21:28 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev
Geoff Mendal [Tue, 2 Feb 2016 21:28:20 +0000 (21:28 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev
Geoff Mendal [Tue, 2 Feb 2016 21:28:02 +0000 (21:28 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev
Geoff Mendal [Tue, 2 Feb 2016 21:27:36 +0000 (21:27 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev
Geoff Mendal [Tue, 2 Feb 2016 21:27:10 +0000 (21:27 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev
Geoff Mendal [Tue, 2 Feb 2016 21:26:55 +0000 (21:26 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev
Geoff Mendal [Tue, 2 Feb 2016 21:26:38 +0000 (21:26 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev
Geoff Mendal [Tue, 2 Feb 2016 21:26:16 +0000 (21:26 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev
Geoff Mendal [Tue, 2 Feb 2016 21:26:02 +0000 (21:26 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev
Geoff Mendal [Tue, 2 Feb 2016 21:25:44 +0000 (21:25 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev
Geoff Mendal [Tue, 2 Feb 2016 21:25:27 +0000 (21:25 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev
Geoff Mendal [Tue, 2 Feb 2016 21:21:58 +0000 (13:21 -0800)]
Import translations. DO NOT MERGE
Change-Id: I6cd7603e8c73642eaa89a1aa5dd6250bf74d5342
Auto-generated-cl: translation import
Geoff Mendal [Tue, 2 Feb 2016 21:18:46 +0000 (13:18 -0800)]
Import translations. DO NOT MERGE
Change-Id: I9e8858c1ec9732e1e9f9a9a7cb212a958629fc2e
Auto-generated-cl: translation import
Geoff Mendal [Tue, 2 Feb 2016 21:15:01 +0000 (13:15 -0800)]
Import translations. DO NOT MERGE
Change-Id: I1bc273863dc43f37c3c48e76c5136d48e2434188
Auto-generated-cl: translation import
Geoff Mendal [Tue, 2 Feb 2016 21:06:29 +0000 (13:06 -0800)]
Import translations. DO NOT MERGE
Change-Id: I522dbce84a7dad42bb0159d365fe3f2049679207
Auto-generated-cl: translation import
Geoff Mendal [Tue, 2 Feb 2016 21:03:26 +0000 (13:03 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ieaafa87030d49b1db501a2837e152e7bf3450c22
Auto-generated-cl: translation import
Geoff Mendal [Tue, 2 Feb 2016 21:00:39 +0000 (13:00 -0800)]
Import translations. DO NOT MERGE
Change-Id: I3811fe74ac702597cf4ba9db60bc035f28632b28
Auto-generated-cl: translation import
Geoff Mendal [Tue, 2 Feb 2016 20:57:33 +0000 (12:57 -0800)]
Import translations. DO NOT MERGE
Change-Id: Iea8b528da87c3a0e12d2f0d782334390b1876a2b
Auto-generated-cl: translation import
Geoff Mendal [Tue, 2 Feb 2016 20:54:05 +0000 (12:54 -0800)]
Import translations. DO NOT MERGE
Change-Id: I8278f026b87460de08b62ea54c36b024eb4f49f8
Auto-generated-cl: translation import
Geoff Mendal [Tue, 2 Feb 2016 20:50:58 +0000 (12:50 -0800)]
Import translations. DO NOT MERGE
Change-Id: I011c83fb945b04260dd0564f22874dd3eab57047
Auto-generated-cl: translation import
Geoff Mendal [Tue, 2 Feb 2016 20:47:33 +0000 (12:47 -0800)]
Import translations. DO NOT MERGE
Change-Id: Iec3ba1c073c38dedce355d0cf19dbb93e8281692
Auto-generated-cl: translation import
Geoff Mendal [Tue, 2 Feb 2016 20:44:13 +0000 (12:44 -0800)]
Import translations. DO NOT MERGE
Change-Id: I9244271734b04d738787da42879d0a5fa95ebe6f
Auto-generated-cl: translation import
Geoff Mendal [Tue, 2 Feb 2016 18:09:58 +0000 (10:09 -0800)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
26887781
Change-Id: I2f77e533633815badf267419addb9d5f7686a200
Geoff Mendal [Tue, 2 Feb 2016 16:09:01 +0000 (16:09 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev
Geoff Mendal [Tue, 2 Feb 2016 16:03:45 +0000 (08:03 -0800)]
Import translations. DO NOT MERGE
Change-Id: I125fdf9cff416791a54d42450e6ef63ffec48a6f
Auto-generated-cl: translation import
Geoff Mendal [Tue, 2 Feb 2016 15:57:06 +0000 (07:57 -0800)]
Import translations. DO NOT MERGE
Change-Id: I491375fe7c3f4bafb6a310830c12cd1459072670
Auto-generated-cl: translation import
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:17:49 +0000 (22:17 +0000)]
Merge "Hack to get devices booting again." into mnc-dr1.5-dev