Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
206,674 Commits 3 Branches 0 Tags
008f7facbed95e67cf45ff81013b83e7f44c54aa
Commit Graph

206674 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Geoff Mendal
008f7facbe Merge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev 
am: 21e0a012d8  -s ours

* commit '21e0a012d811af456bbeb9289012676dac11a49e':
  Import translations. DO NOT MERGE
 2016-02-02 21:34:39 +00:00
Geoff Mendal
abaebda3ff Merge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev 
am: 497300badb  -s ours

* commit '497300badb86c3e253d1ef25b3e290b9bf5c355e':
  Import translations. DO NOT MERGE
 2016-02-02 21:33:44 +00:00
Geoff Mendal
6dfc27dac9 Merge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev 
am: 9561ec3353  -s ours

* commit '9561ec3353753c9b79b03a910725b33d2628c7ab':
  Import translations. DO NOT MERGE
 2016-02-02 21:32:16 +00:00
Geoff Mendal
79d8d1a13f Merge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev 
am: 6f63adbe93  -s ours

* commit '6f63adbe936cf9b3e690c4b40b0ac2e8d41f371b':
  Import translations. DO NOT MERGE
 2016-02-02 21:30:50 +00:00
Geoff Mendal
c2ca962f06 Merge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev 
am: 26b12b719d  -s ours

* commit '26b12b719d317ae8d57f5b43bd9cd1e96b2cad5d':
  Import translations. DO NOT MERGE
 2016-02-02 21:29:47 +00:00
Geoff Mendal
21e0a012d8 Merge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev 2016-02-02 21:26:38 +00:00
Geoff Mendal
497300badb Merge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev 2016-02-02 21:26:16 +00:00
Geoff Mendal
9561ec3353 Merge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev 2016-02-02 21:26:02 +00:00
Geoff Mendal
6f63adbe93 Merge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev 2016-02-02 21:25:44 +00:00
Geoff Mendal
26b12b719d Merge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev 2016-02-02 21:25:27 +00:00
Geoff Mendal
3ffab58eb4 Import translations. DO NOT MERGE 
Change-Id: Iea8b528da87c3a0e12d2f0d782334390b1876a2b
Auto-generated-cl: translation import
 2016-02-02 12:57:33 -08:00
Geoff Mendal
c265968b99 Import translations. DO NOT MERGE 
Change-Id: I8278f026b87460de08b62ea54c36b024eb4f49f8
Auto-generated-cl: translation import
 2016-02-02 12:54:05 -08:00
Geoff Mendal
3553bebd40 Import translations. DO NOT MERGE 
Change-Id: I011c83fb945b04260dd0564f22874dd3eab57047
Auto-generated-cl: translation import
 2016-02-02 12:50:58 -08:00
Geoff Mendal
62d0a4ad3d Import translations. DO NOT MERGE 
Change-Id: Iec3ba1c073c38dedce355d0cf19dbb93e8281692
Auto-generated-cl: translation import
 2016-02-02 12:47:33 -08:00
Geoff Mendal
dd6e3529e4 Import translations. DO NOT MERGE 
Change-Id: I9244271734b04d738787da42879d0a5fa95ebe6f
Auto-generated-cl: translation import
 2016-02-02 12:44:13 -08:00
Geoff Mendal
39c8547b5e Import translations. DO NOT MERGE 
am: 34affa2303  -s ours

* commit '34affa2303e959275eb66d91e2a416d7a69fc520':
  Import translations. DO NOT MERGE
 2016-02-02 18:16:26 +00:00
Geoff Mendal
34affa2303 Import translations. DO NOT MERGE 
Auto-generated-cl: translation import

Bug: 26887781
Change-Id: I2f77e533633815badf267419addb9d5f7686a200
 2016-02-02 10:09:58 -08:00
Geoff Mendal
2335415569 Merge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev 
am: ef9f2cbc84  -s ours

* commit 'ef9f2cbc843c580f6de12aed0a94aeeeadb85ac7':
  Import translations. DO NOT MERGE
 2016-02-02 16:16:45 +00:00
Geoff Mendal
21890da2d8 Import translations. DO NOT MERGE 
am: 3dab749b31  -s ours

* commit '3dab749b317485bbee345e08cebf91e9ac80b59d':
  Import translations. DO NOT MERGE
 2016-02-02 16:12:16 +00:00
Geoff Mendal
ef9f2cbc84 Merge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev 2016-02-02 16:09:01 +00:00
Geoff Mendal
a0cf483a13 Merge "Import translations. DO NOT MERGE" into mnc-dr2-dev 2016-02-02 16:04:49 +00:00
Geoff Mendal
e8342eefbb Import translations. DO NOT MERGE 
Change-Id: I125fdf9cff416791a54d42450e6ef63ffec48a6f
Auto-generated-cl: translation import
 2016-02-02 08:03:45 -08:00
Geoff Mendal
d4f95c1d87 Import translations. DO NOT MERGE 
Change-Id: If53700bcc5370eda1b87001b00f039a4d5fa016a
Auto-generated-cl: translation import
 2016-02-02 17:00:13 +01:00
Geoff Mendal
3dab749b31 Import translations. DO NOT MERGE 
Change-Id: I491375fe7c3f4bafb6a310830c12cd1459072670
Auto-generated-cl: translation import
 2016-02-02 07:57:06 -08:00
Geoff Mendal
1aa5b7517d Import translations. DO NOT MERGE 
Change-Id: If918aa7c054de6b991dbce81ec459d7ca88dc71b
Auto-generated-cl: translation import
 2016-02-02 16:54:58 +01:00
Geoff Mendal
43d3ea4887 Import translations. DO NOT MERGE am: 73ecaf0881 -s ours am: 94d9f3c788 -s ours 
am: 5aec202998  -s ours

* commit '5aec202998dfc1f72159b25892358c9f477d35f5':
  Import translations. DO NOT MERGE
 2016-02-01 23:30:56 +00:00
Geoff Mendal
5aec202998 Import translations. DO NOT MERGE am: 73ecaf0881 -s ours 
am: 94d9f3c788  -s ours

* commit '94d9f3c78856217a1d7c6444fb7f9bc47ce96adc':
  Import translations. DO NOT MERGE
 2016-02-01 23:26:05 +00:00
Geoff Mendal
94d9f3c788 Import translations. DO NOT MERGE 
am: 73ecaf0881  -s ours

* commit '73ecaf0881121522831c33563c5dcdcfda11f895':
  Import translations. DO NOT MERGE
 2016-02-01 23:21:45 +00:00
Bart Sears
795e53a36b Merge "Hack to get devices booting again." into mnc-dr1.5-dev 
am: 29700949ad

* commit '29700949ad981bde8d35219914161f6424e7757b':
  Hack to get devices booting again.
 2016-02-01 22:23:34 +00:00
Bart Sears
29700949ad Merge "Hack to get devices booting again." into mnc-dr1.5-dev 2016-02-01 22:17:49 +00:00
Geoff Mendal
73ecaf0881 Import translations. DO NOT MERGE 
Change-Id: I25920d1a09b527c9e2868537f68d994a40a85e6a
Auto-generated-cl: translation import
 2016-02-01 13:24:23 -08:00
Geoff Mendal
60e392e021 Merge "Import translations. DO NOT MERGE" into mnc-dr2-dev 2016-02-01 21:10:47 +00:00
Geoff Mendal
203eec6b37 Import translations. DO NOT MERGE 
Change-Id: I22adb9c9dea51a632471abe8623deea91ba90b25
Auto-generated-cl: translation import
 2016-02-01 13:08:15 -08:00
Geoff Mendal
21a6f2050a Import translations. DO NOT MERGE am: f544fc21d0 -s ours 
am: b2628caab6  -s ours

* commit 'b2628caab626bac41e551556cabf34c0770cec9b':
  Import translations. DO NOT MERGE
 2016-02-01 20:44:05 +00:00
Geoff Mendal
b2628caab6 Import translations. DO NOT MERGE 
am: f544fc21d0  -s ours

* commit 'f544fc21d0a4d74a13e385d981a805f8add8cebb':
  Import translations. DO NOT MERGE
 2016-02-01 20:41:25 +00:00
Geoff Mendal
f544fc21d0 Import translations. DO NOT MERGE 
Change-Id: Ic5942cf8f289103e9a78b93e69211bf17a47b344
Auto-generated-cl: translation import
 2016-02-01 12:37:44 -08:00
Geoff Mendal
4889505304 Import translations. DO NOT MERGE 
am: 9ff5be7674  -s ours

* commit '9ff5be7674e3a925dc371bc812b220f3c476c501':
  Import translations. DO NOT MERGE
 2016-02-01 20:26:24 +00:00
Geoff Mendal
9ff5be7674 Import translations. DO NOT MERGE 
Auto-generated-cl: translation import

Bug: 26887782
Change-Id: If6bc1bd3f277f0289aecb7c063f899363079c248
 2016-02-01 12:21:06 -08:00
Jeff Sharkey
f67823b815 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 538c11cf21)
 2016-01-30 00:32:08 +00:00
Adam Lesinski
9548f85d9d 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
 2016-01-28 19:24:44 +00:00
Adam Lesinski
c46f6db46e Merge "Don't change screen on time on time changes" into mnc-dr1.5-dev 2016-01-28 19:20:50 +00:00
Adam Lesinski
b2d3ffaa20 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
 2016-01-27 17:51:47 -08:00
Joe LaPenna
b47972df80 [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.
 2016-01-28 01:12:36 +00:00
Joe LaPenna
2bccc45cec [DO NOT MERGE ANYWHERE]: Allow button events in ambient. 
am: 7528f57c4d  -s ours

* commit '7528f57c4ddbde1c6d0a2a352bd8a1af43711013':
  [DO NOT MERGE ANYWHERE]: Allow button events in ambient.
 2016-01-28 01:06:28 +00:00
Joe LaPenna
7528f57c4d [DO NOT MERGE ANYWHERE]: Allow button events in ambient. 
See thread: "key presses & Ambient"

BUG: 25964771
BUG: 26524301

Change-Id: I914edd447c38678a06d27677be4597c0ee384635
 2016-01-27 14:19:44 -08:00
Nick Vaccaro
f5958497d3 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
 2016-01-26 20:21:37 +00:00
Nick Vaccaro
3e413dfcdd 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
 2016-01-26 20:16:15 +00:00
Nick Vaccaro
907108ca0f Merge "[DO NOT MERGE ANYWHERE] Fix bodysensor permission" into cw-e-dev 2016-01-26 20:13:26 +00:00
Peng Xu
79c004b2c1 [DO NOT MERGE ANYWHERE] Fix bodysensor permission 
Bug: 26481493
Bug: 26447970
Change-Id: Ibeaf5a5e39f0dc552cf115d2834a1ec28ecef5ab
 2016-01-26 20:10:27 +00:00
Wei Liu
a12d383117 Add a null check before reference networkInfo. am: b8eaf45e1d 
am: dca8f10031

* commit 'dca8f10031f33c7c85577fa1abcc26d560c90388':
  Add a null check before reference networkInfo.
 2016-01-26 01:57:31 +00:00