OSDN Git Service
Geoff Mendal [Wed, 3 Feb 2016 10:33:55 +0000 (10:33 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev am:
21e0a012d8 -s ours
am:
008f7facbe -s ours
* commit '
008f7facbed95e67cf45ff81013b83e7f44c54aa':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 3 Feb 2016 10:32:50 +0000 (10:32 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev am:
497300badb -s ours
am:
abaebda3ff -s ours
* commit '
abaebda3ff388c6e0c78558ddf00c29801318af6':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 3 Feb 2016 10:31:45 +0000 (10:31 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev am:
9561ec3353 -s ours
am:
6dfc27dac9 -s ours
* commit '
6dfc27dac9eadfa86c811cbbff0e08887d81769d':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 3 Feb 2016 10:30:38 +0000 (10:30 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev am:
6f63adbe93 -s ours
am:
79d8d1a13f -s ours
* commit '
79d8d1a13f719edb5238972ab6123643cf911146':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 3 Feb 2016 10:29:24 +0000 (10:29 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev am:
26b12b719d -s ours
am:
c2ca962f06 -s ours
* commit '
c2ca962f060afedb146d35ff35763b9e8d8c974a':
Import translations. DO NOT MERGE
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
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
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
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
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
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 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:19:18 +0000 (18:19 +0000)]
Import translations. DO NOT MERGE am:
34affa2303 -s ours
am:
39c8547b5e -s ours
* commit '
39c8547b5ebb9cfa7a05e788f43eaa77d9de1241':
Import 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
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:21:50 +0000 (16:21 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev am:
ef9f2cbc84 -s ours
am:
2335415569 -s ours
* commit '
23354155699fb1638ae1c4d5d8600200123d6dc5':
Import translations. DO NOT MERGE
Geoff Mendal [Tue, 2 Feb 2016 16:20:17 +0000 (16:20 +0000)]
Import translations. DO NOT MERGE am:
3dab749b31 -s ours
am:
21890da2d8 -s ours
* commit '
21890da2d808386ec7e8b322f8f033a0b63906d1':
Import translations. DO NOT MERGE
Geoff Mendal [Tue, 2 Feb 2016 16:16:48 +0000 (16:16 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr2-dev
am:
a0cf483a13 -s ours
* commit '
a0cf483a133ad4a0b8c680b1da196266be65150e':
Import translations. DO NOT MERGE
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
Geoff Mendal [Tue, 2 Feb 2016 16:14:23 +0000 (16:14 +0000)]
Import translations. DO NOT MERGE
am:
1aa5b7517d -s ours
* commit '
1aa5b7517d55d1c9d43ad5474da238aa3c14a885':
Import 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
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:04:49 +0000 (16:04 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr2-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 16:00:13 +0000 (17:00 +0100)]
Import translations. DO NOT MERGE
Change-Id: If53700bcc5370eda1b87001b00f039a4d5fa016a
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 [Tue, 2 Feb 2016 15:54:58 +0000 (16:54 +0100)]
Import translations. DO NOT MERGE
Change-Id: If918aa7c054de6b991dbce81ec459d7ca88dc71b
Auto-generated-cl: translation import
Narayan Kamath [Tue, 2 Feb 2016 12:03:53 +0000 (12:03 +0000)]
Narayan Kamath [Tue, 2 Feb 2016 11:55:59 +0000 (11:55 +0000)]
Narayan Kamath [Tue, 2 Feb 2016 11:40:12 +0000 (11:40 +0000)]
Track libcore change
fe6fe17d1ca75ee039df7ab93314f3f1e068794f.
Change-Id: Ib0e5efc903fe522fb2bc314b9000a26e90a4ea57
Narayan Kamath [Tue, 2 Feb 2016 09:36:55 +0000 (09:36 +0000)]
Merge "Alarm: add missing closedir after opendir when searching for RTC"
am:
21b2b7306e
* commit '
21b2b7306e7d0612cdcb90eaa8102b6a7fa3f130':
Alarm: add missing closedir after opendir when searching for RTC
Narayan Kamath [Tue, 2 Feb 2016 09:31:04 +0000 (09:31 +0000)]
Merge "Alarm: add missing closedir after opendir when searching for RTC"
Mykola Kondratenko [Mon, 18 Jan 2016 11:43:30 +0000 (12:43 +0100)]
Alarm: add missing closedir after opendir when searching for RTC
It is mandatory that closedir() is called to deallocate DIR structure
allocated by opendir().
Fix degrade introduced by Google commit
0eb58268.
Change-Id: Ia12154f7f822153b4fc8e6bfb8b2bae17bc45c1a
Geoff Mendal [Mon, 1 Feb 2016 23:35:52 +0000 (23:35 +0000)]
Import translations. DO NOT MERGE am:
73ecaf0881 -s ours am:
94d9f3c788 -s ours am:
5aec202998 -s ours
am:
43d3ea4887 -s ours
* commit '
43d3ea488729e22995df09be756217a87d7fa39b':
Import translations. DO NOT MERGE
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:27:37 +0000 (22:27 +0000)]
Merge "Hack to get devices booting again." into mnc-dr1.5-dev am:
29700949ad
am:
795e53a36b
* commit '
795e53a36b0bda3555e23ea8b54cf97361014a24':
Hack to get devices booting again.
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:14:42 +0000 (21:14 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr2-dev
am:
60e392e021 -s ours
* commit '
60e392e021da2fe8b05986c545b324a4e70f396e':
Import translations. DO NOT MERGE
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:48:37 +0000 (20:48 +0000)]
Import translations. DO NOT MERGE am:
f544fc21d0 -s ours am:
b2628caab6 -s ours
am:
21a6f2050a -s ours
* commit '
21a6f2050adcbbd8f121abbb3c3ef3f0b57391c7':
Import translations. DO NOT MERGE
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:31:03 +0000 (20:31 +0000)]
Import translations. DO NOT MERGE am:
9ff5be7674 -s ours
am:
4889505304 -s ours
* commit '
4889505304b7763e23bd847f833029f3d379ffe7':
Import 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
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
Narayan Kamath [Mon, 1 Feb 2016 11:38:27 +0000 (11:38 +0000)]
Merge "close file in PersistentDataBlockService jni"
am:
c71c44a524
* commit '
c71c44a524e3b5f1f6a9864a0f03b20acd153a6d':
close file in PersistentDataBlockService jni
Narayan Kamath [Mon, 1 Feb 2016 11:31:22 +0000 (11:31 +0000)]
Merge "close file in PersistentDataBlockService jni"
Lianwei Wang [Thu, 14 Jan 2016 02:42:35 +0000 (18:42 -0800)]
close file in PersistentDataBlockService jni
The opened file should be closed.
Change-Id: I8a43b338c5c9eb0a5b1b5329eec767c6395bc7eb
Signed-off-by: Lianwei Wang <lianwei.wang@gmail.com>
Kenny Root [Mon, 1 Feb 2016 11:05:01 +0000 (11:05 +0000)]
Merge changes from topic \'sni\'
am:
c76789d35a
* commit '
c76789d35a7ca92c0b334cc6cf4a44a0044b2a44':
Track libcore change
Track libcore change
Kenny Root [Mon, 1 Feb 2016 10:58:14 +0000 (10:58 +0000)]
Merge changes from topic 'sni'
* changes:
Track libcore change
Track libcore change
Kenny Root [Fri, 15 Jan 2016 23:10:02 +0000 (15:10 -0800)]
Track libcore change
This tracks libcore change I5972095a2b51da50249016fda11ed4c046af4211
which adds honor-cipher-suite-ordering API.
Change-Id: I7f17e42561c76b4c0a3f451d1126458480c90273
Kenny Root [Fri, 15 Jan 2016 23:10:02 +0000 (15:10 -0800)]
Track libcore change
This tracks libcore change I23b85308ac25fd00307d37cff1d93ee6c2bfba98
which adds SNI support.
Change-Id: I93d8a4b07cc1f599123565a5c0672dd7848f05bf
Stephen Hines [Sat, 30 Jan 2016 17:52:28 +0000 (17:52 +0000)]
Merge "Remove the CREATE_FLAG_OPT_LEVEL_0 from the Java API."
am:
49aee686d8
* commit '
49aee686d8c1c888fd0dd2778c19d5968dae0252':
Remove the CREATE_FLAG_OPT_LEVEL_0 from the Java API.
Stephen Hines [Sat, 30 Jan 2016 17:44:52 +0000 (17:44 +0000)]
Merge "Remove the CREATE_FLAG_OPT_LEVEL_0 from the Java API."
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)
Neil Fuller [Fri, 29 Jan 2016 16:28:22 +0000 (16:28 +0000)]
Merge "Unhide @Repeatable"
am:
31312ecfd2
* commit '
31312ecfd2b701c6b9fdc34156e8a12df3022c25':
Unhide @Repeatable
Neil Fuller [Fri, 29 Jan 2016 16:19:36 +0000 (16:19 +0000)]
Merge "Unhide @Repeatable"
Neil Fuller [Fri, 29 Jan 2016 16:18:32 +0000 (16:18 +0000)]
Merge "Unhide @FunctionalInterface"
am:
45a1ea33a4
* commit '
45a1ea33a4e0eb7f1204c03611caf4699ed91d47':
Unhide @FunctionalInterface
Neil Fuller [Tue, 19 Jan 2016 00:34:04 +0000 (16:34 -0800)]
Unhide @Repeatable
Bug:
26623636
(cherry-picked from commit
c98d6a4c19ab9d5620c05b0f5ccb3b91a9eaba15)
Change-Id: I6378d5780def3a26d340f213973a4094e97426f5
Neil Fuller [Fri, 29 Jan 2016 16:10:13 +0000 (16:10 +0000)]
Merge "Unhide @FunctionalInterface"
Neil Fuller [Tue, 19 Jan 2016 00:20:56 +0000 (16:20 -0800)]
Unhide @FunctionalInterface
Bug:
26623636
(cherry-picked from commit
c5064327eae625b67013736048e35388decce52b)
Change-Id: I05fc731356891c4fdba79701b1b87384841d56ca
Neil Fuller [Fri, 29 Jan 2016 15:40:21 +0000 (15:40 +0000)]
Merge "Unhide Method.isDefault"
am:
b05fa3e841
* commit '
b05fa3e841c37ae8089cf3cffc28439ced56884b':
Unhide Method.isDefault
Neil Fuller [Fri, 29 Jan 2016 15:31:38 +0000 (15:31 +0000)]
Merge "Unhide Method.isDefault"
Neil Fuller [Sat, 23 Jan 2016 21:29:36 +0000 (13:29 -0800)]
Unhide Method.isDefault
Bug:
26623636
(cherry-picked from commit
20a4d572263cc288af4bd99849d1acc9e956ff06)
Change-Id: I5fd46b521d5098c72585b2acf06beaea4b9fa93f
Adam Lesinski [Thu, 28 Jan 2016 19:30:10 +0000 (19:30 +0000)]
Merge "Don\'t change screen on time on time changes" into mnc-dr1.5-dev am:
c46f6db46e
am:
9548f85d9d
* commit '
9548f85d9dc4207c3d1a3eed51f98131f8210c5f':
Don't change screen on time on time changes
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
Pavlin Radoslavov [Thu, 28 Jan 2016 02:12:42 +0000 (02:12 +0000)]
Merge "Grant CAP_WAKE_ALARM to the Bluetooth process for any user"
am:
26fdbc1833
* commit '
26fdbc18337a8e9d16e18255e39ce7a16e83d57b':
Grant CAP_WAKE_ALARM to the Bluetooth process for any user
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:17:24 +0000 (01:17 +0000)]
[DO NOT MERGE ANYWHERE]: Allow button events in ambient. am:
7528f57c4d -s ours am:
2bccc45cec -s ours
am:
b47972df80 -s ours
* commit '
b47972df80ffa40c4ea8541f96275c25ed939d7b':
[DO NOT MERGE ANYWHERE]: Allow button events in ambient.
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.
Pavlin Radoslavov [Thu, 28 Jan 2016 00:52:41 +0000 (00:52 +0000)]
Merge "Grant CAP_WAKE_ALARM to the Bluetooth process for any user"
Pavlin Radoslavov [Thu, 28 Jan 2016 00:22:15 +0000 (16:22 -0800)]
Grant CAP_WAKE_ALARM to the Bluetooth process for any user
Use multiuser_get_app_id(uid) to check for AID_BLUETOOTH
and allow the CAP_WAKE_ALARM capability for any user.
Bug:
26784675
Change-Id: I11641e212b7c815e9137ae5620da6ad55f95a899
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
Miao Wang [Wed, 27 Jan 2016 21:43:27 +0000 (21:43 +0000)]
Merge "[RenderScript] Implement APIs for better multi-frame process support."
am:
6ebdbfa549
* commit '
6ebdbfa5498c486a96f2b8b07858eb1a25a6d08a':
[RenderScript] Implement APIs for better multi-frame process support.
Miao Wang [Wed, 27 Jan 2016 21:30:00 +0000 (21:30 +0000)]
Merge "[RenderScript] Implement APIs for better multi-frame process support."
Marie Janssen [Wed, 27 Jan 2016 20:49:55 +0000 (20:49 +0000)]
Merge "IBluetooth: remove dump(), support arguments"
am:
d63847a866
* commit '
d63847a86680df271cc518a6baaac30a7e07c9f5':
IBluetooth: remove dump(), support arguments
Marie Janssen [Wed, 27 Jan 2016 20:42:07 +0000 (20:42 +0000)]
Merge "IBluetooth: remove dump(), support arguments"
Przemyslaw Szczepaniak [Wed, 27 Jan 2016 15:11:51 +0000 (15:11 +0000)]
Merge "Remove java.nio.file package"
am:
804e1e8c15
* commit '
804e1e8c152e46e7c3b47a0e73b4dabd83ba7dcf':
Remove java.nio.file package
Przemyslaw Szczepaniak [Wed, 27 Jan 2016 15:03:39 +0000 (15:03 +0000)]
Merge "Remove java.nio.file package"
Przemyslaw Szczepaniak [Wed, 27 Jan 2016 11:14:53 +0000 (11:14 +0000)]
Remove java.nio.file package
This package has no test coverage, and we don't
know if it was ported properly. This package will
be added in future, with a test suite.
Bug:
26786186
Change-Id: I1bd7989837040da06cd914d366e9674d6b36fe86
Miao Wang [Tue, 27 Oct 2015 00:44:10 +0000 (17:44 -0700)]
[RenderScript] Implement APIs for better multi-frame process support.
Bug:
23535524
Two APIs added for multiframe processing:
- createAllocations(...): To create an array of Allocations sharing the
same Type and Usage. For USAGE_IO_INPUT Allocations, they also share
the same BufferQueue.
- getTimeStamp(): API to retrieve the time stamp associated with the
most recent buffer.
Change-Id: I6b7b35d7dca5e87ee2f3db2ee17cb9cf824bcfe1
Nick Vaccaro [Tue, 26 Jan 2016 20:34:20 +0000 (20:34 +0000)]
Merge "[DO NOT MERGE ANYWHERE] Fix bodysensor permission" into cw-e-dev am:
907108ca0f -s ours am:
3e413dfcdd -s ours
am:
f5958497d3 -s ours
* commit '
f5958497d36ac64ed1f2bbbd80cb0a3a24e94f13':
[DO NOT MERGE ANYWHERE] Fix bodysensor permission
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
OSDN Git Service
