OSDN Git Service
Geoff Mendal [Tue, 7 Oct 2014 00:06:00 +0000 (00:06 +0000)]
am
a997d0e3: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
* commit '
a997d0e3b6e46fdeaa8d91ea306c0ce7602aa52b':
Import translations. DO NOT MERGE
Wei Liu [Tue, 7 Oct 2014 00:05:56 +0000 (00:05 +0000)]
am
a84130d3: am
de93b104: am
a940f865: Merge "Hide bug report notification in Android Framework from watches." into lmp-sprout-dev
* commit '
a84130d3e45ad1ac4cb5843adc027d463c3c304d':
Hide bug report notification in Android Framework from watches.
Geoff Mendal [Mon, 6 Oct 2014 23:34:09 +0000 (23:34 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
Wei Liu [Mon, 6 Oct 2014 22:39:05 +0000 (22:39 +0000)]
am
de93b104: am
a940f865: Merge "Hide bug report notification in Android Framework from watches." into lmp-sprout-dev
* commit '
de93b1049eb84ccdb30e9eb7dd1f255a82e41918':
Hide bug report notification in Android Framework from watches.
Wei Liu [Mon, 6 Oct 2014 22:35:09 +0000 (22:35 +0000)]
am
a940f865: Merge "Hide bug report notification in Android Framework from watches." into lmp-sprout-dev
* commit '
a940f8656d5ca6eb2d737a9a480166c760684ee0':
Hide bug report notification in Android Framework from watches.
ztenghui [Mon, 6 Oct 2014 22:31:33 +0000 (22:31 +0000)]
am
f11d9de4: am
8cdb0bc0: Merge "Use float instead of double to increase spot shadow perf" into lmp-mr1-dev
* commit '
f11d9de43af807ad9d72a62fd1167ff6f9e7b903':
Use float instead of double to increase spot shadow perf
ztenghui [Mon, 6 Oct 2014 22:23:10 +0000 (22:23 +0000)]
am
8cdb0bc0: Merge "Use float instead of double to increase spot shadow perf" into lmp-mr1-dev
* commit '
8cdb0bc08728f18b75eca429678ea9b778191b6e':
Use float instead of double to increase spot shadow perf
Wei Liu [Mon, 6 Oct 2014 22:10:32 +0000 (22:10 +0000)]
Merge "Hide bug report notification in Android Framework from watches." into lmp-sprout-dev
Geoff Mendal [Mon, 6 Oct 2014 22:01:42 +0000 (15:01 -0700)]
Import translations. DO NOT MERGE
Change-Id: I2f46ae080f4869329e7bb9b55f06dc37f2df9af0
Auto-generated-cl: translation import
Wei Liu [Mon, 6 Oct 2014 21:50:10 +0000 (14:50 -0700)]
Hide bug report notification in Android Framework from watches.
Bug:
17806348
Change-Id: I1a90a9bc68d8ef4ff540dbbd9e4af4bfed8a61ae
ztenghui [Mon, 6 Oct 2014 20:04:05 +0000 (20:04 +0000)]
Merge "Use float instead of double to increase spot shadow perf" into lmp-mr1-dev
Amit Mahajan [Mon, 6 Oct 2014 19:44:29 +0000 (19:44 +0000)]
am
40f43c7a: am
384ff9ef: am
15c581fa: am
17d7c796: Merge "ATT: Call does not establish to \'*1\'" into lmp-dev
* commit '
40f43c7aea1bf96846c47ee8fb6766763110d2fc':
ATT: Call does not establish to '*1'
Geoff Mendal [Mon, 6 Oct 2014 19:44:22 +0000 (19:44 +0000)]
am
1c8487c8: (-s ours) am
aece3ec5: (-s ours) am
ce2b1e8c: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev
* commit '
1c8487c80e655eca8bcd13eaf39180123f79b124':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 6 Oct 2014 19:40:01 +0000 (19:40 +0000)]
am
62c39bbe: (-s ours) am
f132e7ef: (-s ours) am
aa5c62f3: (-s ours) am
71236388: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit '
62c39bbe2e18bbf010ea83ac85e00be0c4be31fb':
Import translations. DO NOT MERGE
Christopher Tate [Mon, 6 Oct 2014 19:39:54 +0000 (19:39 +0000)]
am
dd8541d7: am
3dd06aba: am
39006668: am
bbebe423: Merge "adb backup/restore fixes" into lmp-dev
* commit '
dd8541d7812e7d9dc8d0f8c36b3c740a27b4c627':
adb backup/restore fixes
Dianne Hackborn [Mon, 6 Oct 2014 19:39:50 +0000 (19:39 +0000)]
am
db75703b: am
2f577e83: am
90d557b7: am
7f7d240b: Merge "Fix issue #
17752399: Multiple apps broken by GET_TASKS permission change" into lmp-dev
* commit '
db75703b261e1d1446cca210d7dcafa3279c31bc':
Fix issue #
17752399: Multiple apps broken by GET_TASKS permission change
Geoff Mendal [Mon, 6 Oct 2014 19:39:46 +0000 (19:39 +0000)]
am
45a2eb94: (-s ours) am
4795dfba: (-s ours) am
3647aba8: (-s ours) am
ec763118: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit '
45a2eb9452e6323abbad5bdb4fa8e7aa161e7a99':
Import translations. DO NOT MERGE
John Spurlock [Mon, 6 Oct 2014 19:39:41 +0000 (19:39 +0000)]
am
42730c93: am
b6f5cb3e: am
81b96aad: am
78cc93ec: Merge "Fix NPE in StrictMode handling." into lmp-dev
* commit '
42730c93466d2ff533b42f56b4dd0080aad40d59':
Fix NPE in StrictMode handling.
Andrew Solovay [Mon, 6 Oct 2014 19:39:36 +0000 (19:39 +0000)]
am
5ae2730b: am
da81acdf: am
ed2237ae: am
2dd86d50: Merge "Removed preview license." into lmp-dev
* commit '
5ae2730bce75c32954c718190675f6b49b6f4da5':
Removed preview license.
Amit Mahajan [Mon, 6 Oct 2014 19:36:44 +0000 (19:36 +0000)]
am
384ff9ef: am
15c581fa: am
17d7c796: Merge "ATT: Call does not establish to \'*1\'" into lmp-dev
* commit '
384ff9ef5d2dc1278f63eb7e0f42ad03a9163dec':
ATT: Call does not establish to '*1'
Geoff Mendal [Mon, 6 Oct 2014 19:36:41 +0000 (19:36 +0000)]
am
aece3ec5: (-s ours) am
ce2b1e8c: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev
* commit '
aece3ec51115abc11ec580f2823f6ec0ef62e7d6':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 6 Oct 2014 19:32:05 +0000 (19:32 +0000)]
am
f132e7ef: (-s ours) am
aa5c62f3: (-s ours) am
71236388: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit '
f132e7ef0ece5a31595153ec71ef539b4c40f706':
Import translations. DO NOT MERGE
Christopher Tate [Mon, 6 Oct 2014 19:32:01 +0000 (19:32 +0000)]
am
3dd06aba: am
39006668: am
bbebe423: Merge "adb backup/restore fixes" into lmp-dev
* commit '
3dd06aba8074fd3de68659f97d0136e05fc44c81':
adb backup/restore fixes
Dianne Hackborn [Mon, 6 Oct 2014 19:31:57 +0000 (19:31 +0000)]
am
2f577e83: am
90d557b7: am
7f7d240b: Merge "Fix issue #
17752399: Multiple apps broken by GET_TASKS permission change" into lmp-dev
* commit '
2f577e83cbd5b12e47178a90443390210b446102':
Fix issue #
17752399: Multiple apps broken by GET_TASKS permission change
Geoff Mendal [Mon, 6 Oct 2014 19:31:52 +0000 (19:31 +0000)]
am
4795dfba: (-s ours) am
3647aba8: (-s ours) am
ec763118: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit '
4795dfba7fb5f7c03e1f85ec2464258f4987d364':
Import translations. DO NOT MERGE
John Spurlock [Mon, 6 Oct 2014 19:31:49 +0000 (19:31 +0000)]
am
b6f5cb3e: am
81b96aad: am
78cc93ec: Merge "Fix NPE in StrictMode handling." into lmp-dev
* commit '
b6f5cb3e45c9d4cf891d0ee024e7073f6d139677':
Fix NPE in StrictMode handling.
Andrew Solovay [Mon, 6 Oct 2014 19:31:44 +0000 (19:31 +0000)]
am
da81acdf: am
ed2237ae: am
2dd86d50: Merge "Removed preview license." into lmp-dev
* commit '
da81acdffe587e997507cea39b47bf32018cf7ae':
Removed preview license.
Amit Mahajan [Mon, 6 Oct 2014 19:28:53 +0000 (19:28 +0000)]
am
15c581fa: am
17d7c796: Merge "ATT: Call does not establish to \'*1\'" into lmp-dev
* commit '
15c581fa4c0dcff09d2fd65d6978f286b8b23b94':
ATT: Call does not establish to '*1'
Geoff Mendal [Mon, 6 Oct 2014 19:28:44 +0000 (19:28 +0000)]
am
ce2b1e8c: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev
* commit '
ce2b1e8cfaa67f27502d4db837d197409453aae4':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 6 Oct 2014 19:26:16 +0000 (19:26 +0000)]
am
4c3ac5a2: (-s ours) am
b0413040: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
* commit '
4c3ac5a2a5a8ba22ae9f8263fc4db11cf8fa3c19':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 6 Oct 2014 19:26:12 +0000 (19:26 +0000)]
am
c1609420: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
* commit '
c160942009747135472509b00c3a97b4462cec0f':
Import translations. DO NOT MERGE
Amit Mahajan [Mon, 6 Oct 2014 19:23:20 +0000 (19:23 +0000)]
am
17d7c796: Merge "ATT: Call does not establish to \'*1\'" into lmp-dev
* commit '
17d7c79650664c7a112ab175cb2329d2062f4d1e':
ATT: Call does not establish to '*1'
Geoff Mendal [Mon, 6 Oct 2014 19:23:03 +0000 (19:23 +0000)]
am
aa5c62f3: (-s ours) am
71236388: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit '
aa5c62f35999c2dc165771740e96c30b1b932aeb':
Import translations. DO NOT MERGE
Christopher Tate [Mon, 6 Oct 2014 19:22:59 +0000 (19:22 +0000)]
am
39006668: am
bbebe423: Merge "adb backup/restore fixes" into lmp-dev
* commit '
39006668235f9cdeac853911426b1543d3b092d0':
adb backup/restore fixes
Dianne Hackborn [Mon, 6 Oct 2014 19:22:53 +0000 (19:22 +0000)]
am
90d557b7: am
7f7d240b: Merge "Fix issue #
17752399: Multiple apps broken by GET_TASKS permission change" into lmp-dev
* commit '
90d557b7a68e64e049a44560b76b959ef87f13d7':
Fix issue #
17752399: Multiple apps broken by GET_TASKS permission change
Geoff Mendal [Mon, 6 Oct 2014 19:22:48 +0000 (19:22 +0000)]
am
3647aba8: (-s ours) am
ec763118: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit '
3647aba82d30143e301d4bb251085f79308d872a':
Import translations. DO NOT MERGE
John Spurlock [Mon, 6 Oct 2014 19:22:44 +0000 (19:22 +0000)]
am
81b96aad: am
78cc93ec: Merge "Fix NPE in StrictMode handling." into lmp-dev
* commit '
81b96aadbdc3726186c91b51465fb21ead56888a':
Fix NPE in StrictMode handling.
Andrew Solovay [Mon, 6 Oct 2014 19:22:40 +0000 (19:22 +0000)]
am
ed2237ae: am
2dd86d50: Merge "Removed preview license." into lmp-dev
* commit '
ed2237aec8d348ee530f0c88c08392351690e5bb':
Removed preview license.
Geoff Mendal [Mon, 6 Oct 2014 19:21:52 +0000 (19:21 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev
Geoff Mendal [Mon, 6 Oct 2014 19:21:34 +0000 (19:21 +0000)]
am
b0413040: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
* commit '
b04130409494065d36e4bf4a602716de8836e0f5':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 6 Oct 2014 19:21:01 +0000 (19:21 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
Geoff Mendal [Mon, 6 Oct 2014 19:18:36 +0000 (19:18 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
Geoff Mendal [Mon, 6 Oct 2014 19:17:23 +0000 (19:17 +0000)]
am
71236388: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit '
712363889899bfff564a39ef4d88ff048a9e5ec7':
Import translations. DO NOT MERGE
Christopher Tate [Mon, 6 Oct 2014 19:17:17 +0000 (19:17 +0000)]
am
bbebe423: Merge "adb backup/restore fixes" into lmp-dev
* commit '
bbebe42309a7012e0474b916f5209027889e8d57':
adb backup/restore fixes
Dianne Hackborn [Mon, 6 Oct 2014 19:17:10 +0000 (19:17 +0000)]
am
7f7d240b: Merge "Fix issue #
17752399: Multiple apps broken by GET_TASKS permission change" into lmp-dev
* commit '
7f7d240b13b96b617e298c6178af0425308f5ef9':
Fix issue #
17752399: Multiple apps broken by GET_TASKS permission change
Amit Mahajan [Mon, 6 Oct 2014 19:17:05 +0000 (19:17 +0000)]
Merge "ATT: Call does not establish to '*1'" into lmp-dev
Geoff Mendal [Mon, 6 Oct 2014 19:17:04 +0000 (19:17 +0000)]
am
ec763118: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit '
ec763118370e1fa79acb96b82a7ad37b6f2cc02e':
Import translations. DO NOT MERGE
John Spurlock [Mon, 6 Oct 2014 19:16:53 +0000 (19:16 +0000)]
am
78cc93ec: Merge "Fix NPE in StrictMode handling." into lmp-dev
* commit '
78cc93ec80f5dcc487db697a1f9a545890745847':
Fix NPE in StrictMode handling.
Andrew Solovay [Mon, 6 Oct 2014 19:16:47 +0000 (19:16 +0000)]
am
2dd86d50: Merge "Removed preview license." into lmp-dev
* commit '
2dd86d50ae19efa071d83e02545b2767c351fdd6':
Removed preview license.
Geoff Mendal [Mon, 6 Oct 2014 19:10:24 +0000 (19:10 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-dev
Christopher Tate [Mon, 6 Oct 2014 19:09:11 +0000 (19:09 +0000)]
Merge "adb backup/restore fixes" into lmp-dev
Geoff Mendal [Mon, 6 Oct 2014 19:08:45 +0000 (12:08 -0700)]
Import translations. DO NOT MERGE
Change-Id: I97d45a200138bb1a232327dacf2f933b69efc6ec
Auto-generated-cl: translation import
Benson Huang [Mon, 6 Oct 2014 19:03:38 +0000 (19:03 +0000)]
am
37fa980c: am
1e62e476: am
ce4483cb: [FM] Add FM_TUNER audio source to support L version FM radio app
* commit '
37fa980c55c1b5fab84110eb0355cffbae74a692':
[FM] Add FM_TUNER audio source to support L version FM radio app
Bing Gao [Fri, 3 Oct 2014 19:56:04 +0000 (12:56 -0700)]
ATT: Call does not establish to '*1'
Bug:
17809849
Change-Id: I43566c9f3b7a72b06a4b5f2a0a312ac42410269d
Benson Huang [Mon, 6 Oct 2014 18:58:35 +0000 (18:58 +0000)]
am
1e62e476: am
ce4483cb: [FM] Add FM_TUNER audio source to support L version FM radio app
* commit '
1e62e476fa6600dbf8dd82a428efb424a9938177':
[FM] Add FM_TUNER audio source to support L version FM radio app
Geoff Mendal [Mon, 6 Oct 2014 18:57:11 +0000 (11:57 -0700)]
Import translations. DO NOT MERGE
Change-Id: Icce86f4ac15c45a9592f2c6f4cf2f8232cb0605e
Auto-generated-cl: translation import
Benson Huang [Mon, 6 Oct 2014 18:54:19 +0000 (18:54 +0000)]
am
ce4483cb: [FM] Add FM_TUNER audio source to support L version FM radio app
* commit '
ce4483cb83afb3a42a32ef2cb00cf04d6f9018fd':
[FM] Add FM_TUNER audio source to support L version FM radio app
Geoff Mendal [Mon, 6 Oct 2014 18:53:29 +0000 (18:53 +0000)]
am
5a35aba8: (-s ours) am
1c837af0: (-s ours) am
937d6a64: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev
* commit '
5a35aba8a7609ca601f882e9fe09d88b74e3236f':
Import translations. DO NOT MERGE
Benson Huang [Wed, 17 Sep 2014 09:21:02 +0000 (17:21 +0800)]
[FM] Add FM_TUNER audio source to support L version FM radio app
1.MediaRecorder.java: Add FM_TUNER audio source type for FM record.
2.AudioRecord.java: For FM output to the other device,
(except the headset case), record the FM tuner signal to a track
and playback the recorded signal by a track.
3.AudioAttributes.java: Thus we use AudioRecord, need to modify
setCapturePreset to support MediaRecorder.AudioSource.FM_TUNER.
Review: https://partner-android-review.git.corp.google.com/#/c/182071
Signed-off-by: Benson Huang <benson.huang@mediatek.com>
Change-Id: If068d0bbbffb4848887004396a8a8d9bcba1334e
Geoff Mendal [Mon, 6 Oct 2014 18:49:17 +0000 (18:49 +0000)]
am
1c837af0: (-s ours) am
937d6a64: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev
* commit '
1c837af01db817dea4d37ad62c5587b04352ba54':
Import translations. DO NOT MERGE
Dianne Hackborn [Mon, 6 Oct 2014 18:48:33 +0000 (18:48 +0000)]
Merge "Fix issue #
17752399: Multiple apps broken by GET_TASKS permission change" into lmp-dev
Geoff Mendal [Mon, 6 Oct 2014 18:46:29 +0000 (18:46 +0000)]
am
1ceb0f2e: (-s ours) am
88bc51ff: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
* commit '
1ceb0f2ea4e7bb11127e8360ca7e74c862500e18':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 6 Oct 2014 18:46:22 +0000 (11:46 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ia892f6f28e8ad353ae460f3e167bb68d2246ac13
Auto-generated-cl: translation import
Geoff Mendal [Mon, 6 Oct 2014 18:38:41 +0000 (18:38 +0000)]
am
937d6a64: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev
* commit '
937d6a6476be3ce06f3c9c10836a4399b7514231':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 6 Oct 2014 18:37:01 +0000 (18:37 +0000)]
am
f9c11d90: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
* commit '
f9c11d904f46bb325627ff049fd4e8295c236475':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 6 Oct 2014 18:36:44 +0000 (18:36 +0000)]
am
88bc51ff: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
* commit '
88bc51ffcab7c636b5d0b2f8f309b20c6321e89b':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 6 Oct 2014 18:34:20 +0000 (11:34 -0700)]
Import translations. DO NOT MERGE
Change-Id: Iccf9bb82d63d8e5033f916ad5c89cff245ef2087
Auto-generated-cl: translation import
Geoff Mendal [Mon, 6 Oct 2014 18:33:45 +0000 (18:33 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev
Geoff Mendal [Mon, 6 Oct 2014 18:33:29 +0000 (18:33 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
Geoff Mendal [Mon, 6 Oct 2014 18:32:34 +0000 (18:32 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
Geoff Mendal [Mon, 6 Oct 2014 18:32:18 +0000 (18:32 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-dev
Geoff Mendal [Mon, 6 Oct 2014 17:56:58 +0000 (10:56 -0700)]
Import translations. DO NOT MERGE
Change-Id: I391b269b0d535fa7d8a4082cb0271b0aeb16a497
Auto-generated-cl: translation import
Geoff Mendal [Mon, 6 Oct 2014 17:56:03 +0000 (10:56 -0700)]
Import translations. DO NOT MERGE
Change-Id: Id44a50fdb0bd6b01fa0a3930647b310dd44d4674
Auto-generated-cl: translation import
Geoff Mendal [Mon, 6 Oct 2014 17:55:10 +0000 (10:55 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ieb7aeaea1204f4ba7daf3abd7a30f647564807dd
Auto-generated-cl: translation import
John Spurlock [Mon, 6 Oct 2014 17:54:40 +0000 (17:54 +0000)]
Merge "Fix NPE in StrictMode handling." into lmp-dev
Geoff Mendal [Mon, 6 Oct 2014 17:54:01 +0000 (10:54 -0700)]
Import translations. DO NOT MERGE
Change-Id: I2100b649d1f2866cdc5ffd13f264afba347b6685
Auto-generated-cl: translation import
Andrew Solovay [Mon, 6 Oct 2014 17:51:52 +0000 (17:51 +0000)]
Merge "Removed preview license." into lmp-dev
Adam Powell [Mon, 6 Oct 2014 17:21:50 +0000 (17:21 +0000)]
am
95891d26: am
00092db1: Fix build breakage in API check
* commit '
95891d2602585205eaad5cdabe89f45c6ed8504c':
Fix build breakage in API check
Adam Powell [Mon, 6 Oct 2014 17:17:36 +0000 (17:17 +0000)]
am
00092db1: Fix build breakage in API check
* commit '
00092db1af06d0434cae88aa736be9ed539e2a9c':
Fix build breakage in API check
Adam Powell [Mon, 6 Oct 2014 17:11:43 +0000 (10:11 -0700)]
Fix build breakage in API check
Change-Id: I0fe7849b8b834fb32b13e60657685f72d1110d21
Yuncheol Heo [Mon, 6 Oct 2014 16:52:31 +0000 (16:52 +0000)]
am
a4b895a1: am
345f3d00: am
4cb8455f: am
71c4578d: Merge "CEC: Reset active source status on routing control" into lmp-dev
* commit '
a4b895a18b91959e06b9ef3e634106091e2acb56':
CEC: Reset active source status on routing control
Benjamin Franz [Mon, 6 Oct 2014 16:52:27 +0000 (16:52 +0000)]
am
00fcb749: am
31409c0c: Merge "Introduce new API to get an unbadged icon and unbadge permissions." into lmp-mr1-dev
* commit '
00fcb749cbd26c83d1a29a974bd92967b41c5882':
Introduce new API to get an unbadged icon and unbadge permissions.
Yuncheol Heo [Mon, 6 Oct 2014 16:47:14 +0000 (16:47 +0000)]
am
345f3d00: am
4cb8455f: am
71c4578d: Merge "CEC: Reset active source status on routing control" into lmp-dev
* commit '
345f3d00b8dccb68988bdf9f6fb069fcfe06bb24':
CEC: Reset active source status on routing control
Benjamin Franz [Mon, 6 Oct 2014 16:47:11 +0000 (16:47 +0000)]
am
31409c0c: Merge "Introduce new API to get an unbadged icon and unbadge permissions." into lmp-mr1-dev
* commit '
31409c0ccd1434efdcfff8f7ddcd7c4207660104':
Introduce new API to get an unbadged icon and unbadge permissions.
John Spurlock [Mon, 6 Oct 2014 16:36:45 +0000 (12:36 -0400)]
Fix NPE in StrictMode handling.
Bug:
17875462
Change-Id: I0bf31abe2d07335addd57976aca110565bb63cc4
Yuncheol Heo [Mon, 6 Oct 2014 16:30:02 +0000 (16:30 +0000)]
am
4cb8455f: am
71c4578d: Merge "CEC: Reset active source status on routing control" into lmp-dev
* commit '
4cb8455fba9b70339bacf28ff813118ad542165d':
CEC: Reset active source status on routing control
Benjamin Franz [Mon, 6 Oct 2014 16:26:24 +0000 (16:26 +0000)]
Merge "Introduce new API to get an unbadged icon and unbadge permissions." into lmp-mr1-dev
Yuncheol Heo [Mon, 6 Oct 2014 16:22:17 +0000 (16:22 +0000)]
am
71c4578d: Merge "CEC: Reset active source status on routing control" into lmp-dev
* commit '
71c4578def00a5a4b9e159fd1ab88e616bc7e159':
CEC: Reset active source status on routing control
Yuncheol Heo [Mon, 6 Oct 2014 16:16:45 +0000 (16:16 +0000)]
Merge "CEC: Reset active source status on routing control" into lmp-dev
Jinsuk Kim [Mon, 6 Oct 2014 05:28:06 +0000 (14:28 +0900)]
CEC: Reset active source status on routing control
Set active source status to false when broadcast routing control
commands indicate other device is about to be the new active source.
Bug:
17840270
Change-Id: I176e21ec8789624e29421b912ba641a21f0f5f21
Jeff Sharkey [Mon, 6 Oct 2014 04:29:25 +0000 (04:29 +0000)]
am
97e18d56: am
ce85d7f4: am
b03b9759: am
4c880877: Merge "Recover from missing upgrade to system package." into lmp-dev
* commit '
97e18d563844f7d2a7669e0129edc4bf425bf25b':
Recover from missing upgrade to system package.
Jeff Sharkey [Mon, 6 Oct 2014 04:25:38 +0000 (04:25 +0000)]
am
ce85d7f4: am
b03b9759: am
4c880877: Merge "Recover from missing upgrade to system package." into lmp-dev
* commit '
ce85d7f44f5c88dcc18a19738bfcd20d9dbb4a78':
Recover from missing upgrade to system package.
Jeff Sharkey [Mon, 6 Oct 2014 04:17:05 +0000 (04:17 +0000)]
am
b03b9759: am
4c880877: Merge "Recover from missing upgrade to system package." into lmp-dev
* commit '
b03b9759d3ec1f3dacde71314795a3451f67fbab':
Recover from missing upgrade to system package.
Jeff Sharkey [Mon, 6 Oct 2014 04:08:57 +0000 (04:08 +0000)]
am
4c880877: Merge "Recover from missing upgrade to system package." into lmp-dev
* commit '
4c88087776305f54bec0aae59b8e63bc803c1401':
Recover from missing upgrade to system package.
Jeff Sharkey [Mon, 6 Oct 2014 04:01:33 +0000 (04:01 +0000)]
Merge "Recover from missing upgrade to system package." into lmp-dev
Wonsik Kim [Mon, 6 Oct 2014 02:40:38 +0000 (02:40 +0000)]
am
a83bf228: am
aa4b0d82: TIF: fix retrieving sinkConfig
* commit '
a83bf228b77fd421c7064fca5cce178a6cbe7323':
TIF: fix retrieving sinkConfig
Wonsik Kim [Mon, 6 Oct 2014 02:15:14 +0000 (02:15 +0000)]
am
aa4b0d82: TIF: fix retrieving sinkConfig
* commit '
aa4b0d82a1fdb92fbf4f8852f326f2687ee55fa7':
TIF: fix retrieving sinkConfig
Wonsik Kim [Mon, 6 Oct 2014 00:58:35 +0000 (09:58 +0900)]
TIF: fix retrieving sinkConfig
Bug:
17399450
Change-Id: I9d2f88de0fc967faeede853028f74478f4fa8f24
Jeff Sharkey [Sun, 5 Oct 2014 21:12:42 +0000 (14:12 -0700)]
Recover from missing upgrade to system package.
When a system app has been upgraded, we mark the built-in version as
disabled, and skip it when parsing built-in apps, since we expect
the userdata version to be scanned a few moments later.
However, in very rare cases we can end up missing the expected
userdata version, and we'd end up dropping the package entirely, even
though we have a built-in version to fall back to. This change
handles that case by rescanning and enabling the built-in version when
the userdata version never materializes.
Also include critical log messages in check-in dumpsys to help track
down how we ended up in this state.
Bug:
17805839
Change-Id: I9971f882f9bb8ab7934c20b04e0b72366c4d04d0
Baligh Uddin [Sun, 5 Oct 2014 18:16:45 +0000 (18:16 +0000)]
am
ec589559: (-s ours) am
f7a9072e: (-s ours) am
a37450f0: (-s ours) am
ec3ce59c: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit '
ec5895592b586007adf9902568d4ee1e6c53dbed':
Import translations. DO NOT MERGE
OSDN Git Service
