OSDN Git Service

android-x86/frameworks-base.git
8 years agoMerge "Import translations. DO NOT MERGE" into mnc-dr2-dev
Geoff Mendal [Tue, 2 Feb 2016 23:46:03 +0000 (23:46 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr2-dev

8 years agoMerge "Import translations. DO NOT MERGE" into mnc-dr2-dev
Geoff Mendal [Tue, 2 Feb 2016 23:45:28 +0000 (23:45 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr2-dev

8 years agoMerge "Import translations. DO NOT MERGE" into mnc-dr2-dev
Geoff Mendal [Tue, 2 Feb 2016 23:45:09 +0000 (23:45 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr2-dev

8 years agoMerge "Import translations. DO NOT MERGE" into mnc-dr2-dev
Geoff Mendal [Tue, 2 Feb 2016 23:44:52 +0000 (23:44 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr2-dev

8 years agoMerge "Import translations. DO NOT MERGE" into mnc-dr2-dev
Geoff Mendal [Tue, 2 Feb 2016 23:44:33 +0000 (23:44 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr2-dev

8 years agoImport translations. DO NOT MERGE
Geoff Mendal [Tue, 2 Feb 2016 23:34:29 +0000 (05:04 +0530)]
Import translations. DO NOT MERGE

Change-Id: Ibf6b1c318c013377d837a50a749fec32f4d19742
Auto-generated-cl: translation import

8 years agoImport translations. DO NOT MERGE
Geoff Mendal [Tue, 2 Feb 2016 23:29:17 +0000 (04:59 +0530)]
Import translations. DO NOT MERGE

Change-Id: I4e9f959b3a04dee69bfca04ad71af34783897726
Auto-generated-cl: translation import

8 years agoImport translations. DO NOT MERGE
Geoff Mendal [Tue, 2 Feb 2016 23:24:24 +0000 (04:54 +0530)]
Import translations. DO NOT MERGE

Change-Id: I26681000284f7238a694490e0a84c0d087fcd662
Auto-generated-cl: translation import

8 years agoImport translations. DO NOT MERGE
Geoff Mendal [Tue, 2 Feb 2016 23:19:17 +0000 (04:49 +0530)]
Import translations. DO NOT MERGE

Change-Id: I33f38f6afc185393cc34048ad3b57e32306f2cde
Auto-generated-cl: translation import

8 years agoImport translations. DO NOT MERGE
Geoff Mendal [Tue, 2 Feb 2016 23:14:14 +0000 (04:44 +0530)]
Import translations. DO NOT MERGE

Change-Id: Id5e09da7c8c9a540e6280c24a6e372927d347184
Auto-generated-cl: translation import

8 years agoMerge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev
Geoff Mendal [Tue, 2 Feb 2016 21:48:24 +0000 (21:48 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev
am: c0297abd93  -s ours

* commit 'c0297abd931306368939f0d93ce28fc82584705e':
  Import translations. DO NOT MERGE

8 years agoMerge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev
Geoff Mendal [Tue, 2 Feb 2016 21:46:54 +0000 (21:46 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev
am: 4a27667bf5  -s ours

* commit '4a27667bf582b349dc9403c7d10efa5904577620':
  Import translations. DO NOT MERGE

8 years agoMerge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev
Geoff Mendal [Tue, 2 Feb 2016 21:45:55 +0000 (21:45 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev
am: 091513d6e8  -s ours

* commit '091513d6e84a1a28f1de1174532e42784d3ce584':
  Import translations. DO NOT MERGE

8 years agoMerge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev
Geoff Mendal [Tue, 2 Feb 2016 21:44:53 +0000 (21:44 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev
am: 1974686db5  -s ours

* commit '1974686db5089e9b899f3700fb66a4269758d082':
  Import translations. DO NOT MERGE

8 years agoMerge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev
Geoff Mendal [Tue, 2 Feb 2016 21:40:54 +0000 (21:40 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev

8 years agoMerge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev
Geoff Mendal [Tue, 2 Feb 2016 21:40:04 +0000 (21:40 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev
am: 063357312c  -s ours

* commit '063357312c77681ca7093f4416ed12ff0ae04c83':
  Import translations. DO NOT MERGE

8 years agoImport translations. DO NOT MERGE
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

8 years agoMerge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev
Geoff Mendal [Tue, 2 Feb 2016 21:38:02 +0000 (21:38 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev
am: 3122eedcd3  -s ours

* commit '3122eedcd3f2e378a96d9486d6418449414059ac':
  Import translations. DO NOT MERGE

8 years agoMerge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev
Geoff Mendal [Tue, 2 Feb 2016 21:36:04 +0000 (21:36 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev
am: b697973e2a  -s ours

* commit 'b697973e2a408f8485d10fe53b22146da8670517':
  Import translations. DO NOT MERGE

8 years agoMerge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev
Geoff Mendal [Tue, 2 Feb 2016 21:34:39 +0000 (21:34 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev
am: 21e0a012d8  -s ours

* commit '21e0a012d811af456bbeb9289012676dac11a49e':
  Import translations. DO NOT MERGE

8 years agoMerge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev
Geoff Mendal [Tue, 2 Feb 2016 21:33:44 +0000 (21:33 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev
am: 497300badb  -s ours

* commit '497300badb86c3e253d1ef25b3e290b9bf5c355e':
  Import translations. DO NOT MERGE

8 years agoMerge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev
Geoff Mendal [Tue, 2 Feb 2016 21:32:16 +0000 (21:32 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev
am: 9561ec3353  -s ours

* commit '9561ec3353753c9b79b03a910725b33d2628c7ab':
  Import translations. DO NOT MERGE

8 years agoMerge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev
Geoff Mendal [Tue, 2 Feb 2016 21:30:50 +0000 (21:30 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev
am: 6f63adbe93  -s ours

* commit '6f63adbe936cf9b3e690c4b40b0ac2e8d41f371b':
  Import translations. DO NOT MERGE

8 years agoMerge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev
Geoff Mendal [Tue, 2 Feb 2016 21:29:47 +0000 (21:29 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev
am: 26b12b719d  -s ours

* commit '26b12b719d317ae8d57f5b43bd9cd1e96b2cad5d':
  Import translations. DO NOT MERGE

8 years agoMerge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev
Geoff Mendal [Tue, 2 Feb 2016 21:28:40 +0000 (21:28 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev

8 years agoMerge "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

8 years agoMerge "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

8 years agoMerge "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

8 years agoMerge "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

8 years agoMerge "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

8 years agoMerge "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

8 years agoMerge "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

8 years agoMerge "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

8 years agoMerge "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

8 years agoMerge "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

8 years agoImport translations. DO NOT MERGE
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

8 years agoImport translations. DO NOT MERGE
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

8 years agoImport translations. DO NOT MERGE
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

8 years agoImport translations. DO NOT MERGE
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

8 years agoImport translations. DO NOT MERGE
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

8 years agoImport translations. DO NOT MERGE
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

8 years agoImport translations. DO NOT MERGE
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

8 years agoImport translations. DO NOT MERGE
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

8 years agoImport translations. DO NOT MERGE
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

8 years agoImport translations. DO NOT MERGE
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

8 years agoImport translations. DO NOT MERGE
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

8 years agoImport translations. DO NOT MERGE
Geoff Mendal [Tue, 2 Feb 2016 18:16:26 +0000 (18:16 +0000)]
Import translations. DO NOT MERGE
am: 34affa2303  -s ours

* commit '34affa2303e959275eb66d91e2a416d7a69fc520':
  Import translations. DO NOT MERGE

8 years agoImport translations. DO NOT MERGE
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

8 years agoMerge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev
Geoff Mendal [Tue, 2 Feb 2016 16:16:45 +0000 (16:16 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev
am: ef9f2cbc84  -s ours

* commit 'ef9f2cbc843c580f6de12aed0a94aeeeadb85ac7':
  Import translations. DO NOT MERGE

8 years agoImport translations. DO NOT MERGE
Geoff Mendal [Tue, 2 Feb 2016 16:12:16 +0000 (16:12 +0000)]
Import translations. DO NOT MERGE
am: 3dab749b31  -s ours

* commit '3dab749b317485bbee345e08cebf91e9ac80b59d':
  Import translations. DO NOT MERGE

8 years agoMerge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev
Geoff Mendal [Tue, 2 Feb 2016 16:09:01 +0000 (16:09 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev

8 years agoMerge "Import translations. DO NOT MERGE" into mnc-dr2-dev
Geoff Mendal [Tue, 2 Feb 2016 16:04:49 +0000 (16:04 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr2-dev

8 years agoImport translations. DO NOT MERGE
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

8 years agoImport translations. DO NOT MERGE
Geoff Mendal [Tue, 2 Feb 2016 16:00:13 +0000 (17:00 +0100)]
Import translations. DO NOT MERGE

Change-Id: If53700bcc5370eda1b87001b00f039a4d5fa016a
Auto-generated-cl: translation import

8 years agoImport translations. DO NOT MERGE
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

8 years agoImport translations. DO NOT MERGE
Geoff Mendal [Tue, 2 Feb 2016 15:54:58 +0000 (16:54 +0100)]
Import translations. DO NOT MERGE

Change-Id: If918aa7c054de6b991dbce81ec459d7ca88dc71b
Auto-generated-cl: translation import

8 years agoImport translations. DO NOT MERGE am: 73ecaf0881 -s ours am: 94d9f3c788 -s ours
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

8 years agoImport translations. DO NOT MERGE am: 73ecaf0881 -s ours
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

8 years agoImport 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

8 years agoMerge "Hack to get devices booting again." into mnc-dr1.5-dev
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.

8 years agoMerge "Hack to get devices booting again." into mnc-dr1.5-dev
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

8 years agoImport 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

8 years agoMerge "Import translations. DO NOT MERGE" into mnc-dr2-dev
Geoff Mendal [Mon, 1 Feb 2016 21:10:47 +0000 (21:10 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr2-dev

8 years agoImport translations. DO NOT MERGE
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

8 years agoImport translations. DO NOT MERGE am: f544fc21d0 -s ours
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

8 years agoImport 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

8 years agoImport 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

8 years agoImport translations. DO NOT MERGE
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

8 years agoImport 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

8 years agoHack to get devices booting again.
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)

8 years agoMerge "Don\'t change screen on time on time changes" into mnc-dr1.5-dev
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

8 years agoMerge "Don't change screen on time on time changes" into mnc-dr1.5-dev
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

8 years agoDon't change screen on time on time changes
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

8 years ago[DO NOT MERGE ANYWHERE]: Allow button events in ambient. am: 7528f57c4d -s ours
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.

8 years ago[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.

8 years ago[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

8 years agoMerge "[DO NOT MERGE ANYWHERE] Fix bodysensor permission" into cw-e-dev am: 907108ca0...
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

8 years agoMerge "[DO NOT MERGE ANYWHERE] Fix bodysensor permission" into cw-e-dev
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

8 years agoMerge "[DO NOT MERGE ANYWHERE] Fix bodysensor permission" into cw-e-dev
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

8 years ago[DO NOT MERGE ANYWHERE] Fix bodysensor permission
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

8 years agoAdd a null check before reference networkInfo. am: b8eaf45e1d
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.

8 years agoAdd 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.

8 years agoAdd 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

8 years agoMerge "Don\'t assume kernel tick is 100Hz" into mnc-dr1.5-dev
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

8 years agoMerge "Don't assume kernel tick is 100Hz" into mnc-dr1.5-dev
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

8 years agoCheck 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

8 years agoCheck 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

8 years agoDon't assume kernel tick is 100Hz
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

8 years agoMerge "Debug logging for when getActiveNetworkInfo returns BLOCKED." into mnc-dr1...
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.

8 years agoMerge "Debug logging for when getActiveNetworkInfo returns BLOCKED." into mnc-dr1...
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

8 years agoMerge "DO NOT MERGE ANYWHERE Improve logging in BluetoothHeadsetClientCall." into...
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.

8 years agoMerge "DO NOT MERGE ANYWHERE Improve logging in BluetoothHeadsetClientCall." into...
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.

8 years agoMerge "DO NOT MERGE ANYWHERE Improve logging in BluetoothHeadsetClientCall." into...
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

8 years agoDO NOT MERGE ANYWHERE Improve logging in BluetoothHeadsetClientCall.
Bryce Lee [Thu, 21 Jan 2016 22:29:42 +0000 (14:29 -0800)]
DO NOT MERGE ANYWHERE Improve logging in BluetoothHeadsetClientCall.

Change-Id: I3b1b3946ca21c0bbc902a2c521938239a486d98a

8 years agoDebug logging for when getActiveNetworkInfo returns BLOCKED.
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

8 years agoDO NOT MERGE Redact Account info from getCurrentSyncs am: a5cafd2a93 am: 06ef7dfdf0...
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

8 years agoDO NOT MERGE Redact Account info from getCurrentSyncs am: a5cafd2a93 am: 06ef7dfdf0...
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

8 years agoDO NOT MERGE Redact Account info from getCurrentSyncs am: a5cafd2a93 am: 06ef7dfdf0...
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

8 years agoDO NOT MERGE Redact Account info from getCurrentSyncs am: a5cafd2a93 am: 06ef7dfdf0...
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

8 years agoDO NOT MERGE Redact Account info from getCurrentSyncs am: a5cafd2a93 am: 06ef7dfdf0...
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