OSDN Git Service
Yohei Yukawa [Fri, 14 Mar 2014 19:00:17 +0000 (19:00 +0000)]
am
fd2f8d43: am
51b921d0: DO NOT MERGE - Preserve the order of InputMethodManager method calls
* commit '
fd2f8d43419d1f25ced8b2bac96407925dd4c471':
DO NOT MERGE - Preserve the order of InputMethodManager method calls
Craig Mautner [Fri, 14 Mar 2014 19:00:07 +0000 (19:00 +0000)]
am
a921d8b6: am
3217cc6f: Merge "Fix activities appearing behind launcher icons" into klp-dev
* commit '
a921d8b6b1a3478f258b9999ed909907216edbae':
Fix activities appearing behind launcher icons
Mike Lockwood [Fri, 14 Mar 2014 18:48:13 +0000 (18:48 +0000)]
am
ff64f5ed: am
381374b3: Merge "UsbDeviceManager: Fix race condition between accessory start and USB configured uevents" into klp-dev
* commit '
ff64f5ed7c2b55878d149d546092e029cba15465':
UsbDeviceManager: Fix race condition between accessory start and USB configured uevents
Victoria Lease [Fri, 14 Mar 2014 17:54:45 +0000 (17:54 +0000)]
am
1365d982: am
4cde7734: Merge "remove unnecessary switchUser call"
* commit '
1365d98270e0a0a61d10743820e923aeff974b39':
remove unnecessary switchUser call
Victoria Lease [Fri, 14 Mar 2014 17:51:45 +0000 (10:51 -0700)]
am
4cde7734: Merge "remove unnecessary switchUser call"
* commit '
4cde773435074809672f9de6a47b26de902a83d1':
remove unnecessary switchUser call
Victoria Lease [Fri, 14 Mar 2014 17:48:00 +0000 (17:48 +0000)]
Merge "remove unnecessary switchUser call"
Narayan Kamath [Fri, 14 Mar 2014 14:22:40 +0000 (14:22 +0000)]
am
c0232642: am
629daddd: Merge "Fix layoutlib build."
* commit '
c0232642b74517aa2717673f0811ba65c620f491':
Fix layoutlib build.
Narayan Kamath [Fri, 14 Mar 2014 14:19:24 +0000 (07:19 -0700)]
am
629daddd: Merge "Fix layoutlib build."
* commit '
629daddd03b598616de7c30a13b1f9f9b11b98fe':
Fix layoutlib build.
Narayan Kamath [Fri, 14 Mar 2014 14:12:35 +0000 (14:12 +0000)]
Merge "Fix layoutlib build."
Narayan Kamath [Fri, 14 Mar 2014 14:10:30 +0000 (14:10 +0000)]
Fix layoutlib build.
Was using private data structures from libcore.
Change-Id: I5bd43190081891659e18b5c871686e6078efcc81
Ricardo Cervera [Fri, 14 Mar 2014 04:17:42 +0000 (04:17 +0000)]
am
50694917: am
7e566239: Merge "docs: Updated Building your First App tutorial. Bug:
13429905" into klp-docs
* commit '
506949173761f9bde016b9d74de94df4b63df370':
docs: Updated Building your First App tutorial. Bug:
13429905
Joe Fernandez [Fri, 14 Mar 2014 04:13:49 +0000 (04:13 +0000)]
am
8bb11153: am
f7267c8b: Merge "Doc change: Update developer video on home page carousel." into klp-docs
* commit '
8bb11153f946a95485644b08a067472735810ef2':
Doc change: Update developer video on home page carousel.
John Spurlock [Fri, 14 Mar 2014 04:13:30 +0000 (04:13 +0000)]
am
ad66c27b: am
6d9b034c: Fix typo in public logcat page.
* commit '
ad66c27b9c2f2dce1b9443018a7c4d097bc08fc3':
Fix typo in public logcat page.
Ricardo Cervera [Fri, 14 Mar 2014 04:13:12 +0000 (04:13 +0000)]
am
8714a343: am
ef6c9470: Merge "docs: Added step to get JDK to the Android Studio install instructions." into klp-docs
* commit '
8714a3437e13b4a403e49c4c624f272dd6dc8f4e':
docs: Added step to get JDK to the Android Studio install instructions.
Katie McCormick [Fri, 14 Mar 2014 04:13:05 +0000 (04:13 +0000)]
am
b681794d: am
07c0ad97: Merge "Doc update: new doc studio layout editor" into klp-docs
* commit '
b681794d2583e06693c23eec1af4e282b067abd9':
Doc update: new doc studio layout editor
John Spurlock [Fri, 14 Mar 2014 04:13:00 +0000 (04:13 +0000)]
am
62826f55: am
f6228d95: Merge "Fix doc typos in AppOpsManager.java" into klp-docs
* commit '
62826f55be4415684b4e321469298ba43d598bbb':
Fix doc typos in AppOpsManager.java
JP Abgrall [Fri, 14 Mar 2014 04:12:54 +0000 (04:12 +0000)]
am
4ecd833e: am
7baa7c80: Merge "ConnectivityService: add support to set TCP initial rwnd" into klp-dev
* commit '
4ecd833ee35d1120f8c1ae52367947cacfc263a4':
ConnectivityService: add support to set TCP initial rwnd
Chad Brubaker [Fri, 14 Mar 2014 04:12:46 +0000 (04:12 +0000)]
am
78f204ae: am
8e240af5: Merge "Remove SO_BINDTODEVICE from VPN protect" into klp-dev
* commit '
78f204aed8c0f3c8174616801d66f96a9a00a5fd':
Remove SO_BINDTODEVICE from VPN protect
Svetoslav [Fri, 14 Mar 2014 04:12:42 +0000 (04:12 +0000)]
am
fc1d0471: am
11b7d9fa: Merge "PrintSpooler crash if printer is reported to have only one color mode." into klp-dev
* commit '
fc1d04714e9042a1b01c7a725fafa1820b8c14fb':
PrintSpooler crash if printer is reported to have only one color mode.
Adrian Roos [Fri, 14 Mar 2014 04:12:39 +0000 (04:12 +0000)]
am
16858164: am
cd0d8cb2: Merge "DO NOT MERGE - Fix keyguard pattern lockout bug" into klp-dev
* commit '
16858164c73f0696d12161e97bad9cb22c55e603':
DO NOT MERGE - Fix keyguard pattern lockout bug
Baligh Uddin [Fri, 14 Mar 2014 04:12:32 +0000 (04:12 +0000)]
am
a5a921e3: (-s ours) am
4545b1d2: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
a5a921e3a80eddd4622dd4d2d1c91d5ee71583f5':
Import translations. DO NOT MERGE
Dianne Hackborn [Fri, 14 Mar 2014 04:12:24 +0000 (04:12 +0000)]
am
e5191aab: am
a796168d: Merge "Fix issue #
11965706: Calls using IntentChooser are now Broken in 4.3 and 4.4" into klp-dev
* commit '
e5191aabff5b9b751349b8634836a858af744905':
Fix issue #
11965706: Calls using IntentChooser are now Broken in 4.3 and 4.4
Jeff Brown [Fri, 14 Mar 2014 04:02:54 +0000 (21:02 -0700)]
resolved conflicts for merge of
825dd9dd to klp-dev-plus-aosp
.
Change-Id: I2363c40f641e7e60487354e1710312db2cbbc89a
Yohei Yukawa [Fri, 14 Mar 2014 03:03:08 +0000 (03:03 +0000)]
am
51b921d0: DO NOT MERGE - Preserve the order of InputMethodManager method calls
* commit '
51b921d0e33302b3f431dcfa15bd6588408525ea':
DO NOT MERGE - Preserve the order of InputMethodManager method calls
Yohei Yukawa [Wed, 5 Mar 2014 05:53:01 +0000 (14:53 +0900)]
DO NOT MERGE - Preserve the order of InputMethodManager method calls
Cherrypick of I0f8d33b0c77129f72581bc43e7f4fdc25469b520
This CL allows the Framework class InputMethodManager to behave
in a more deterministic way, that is to say, with an I/O barrier.
InputMethodManager#setAdditionalInputMethodSubtypes is internally
implemented as a RPC to the corresponding counterpart in
InputMethodManagerService. The problem here is that this RPC is
marked as "oneway". As a consequence, this public API call
returns immediately without waiting the additional subtypes are
actually added. This behavior is also not documented so far
unfortunately.
See the following demo code:
Final InputMethodManager imm = ...;
imm.setAdditionalInputMethodSubtypes(id, subTypes);
Final List<InputMethodInfo> ims = imm.getInputMethodList();
Currently, it is not guaranteed that the InputMethodInfo returned
from #getInputMethodList reflects the result of the previous call
of #setAdditionalInputMethodSubtypes because of its undocumented
asynchronous nature.
With this CL, InputMethodManager#setAdditionalInputMethodSubtypes
behaves as if it has I/O barrier. This change should make it easy
for IME developers to use additional subtype mechanism.
BUG:
13033954
BUG:
13291370
Change-Id: I0455b176bfb3176c533ba3241881f05092b98abc
Craig Mautner [Fri, 14 Mar 2014 00:42:43 +0000 (00:42 +0000)]
am
3217cc6f: Merge "Fix activities appearing behind launcher icons" into klp-dev
* commit '
3217cc6ff2b3139d8854a3f681da6ae1d163ac92':
Fix activities appearing behind launcher icons
Zhihai Xu [Fri, 14 Mar 2014 00:40:32 +0000 (00:40 +0000)]
am
bdd4c31a: am
60d7c995: Merge "DO NOT MERGE setAvrcpAbsoluteVolume is passed wrong unit parameter from AudioManager" into klp-dev
* commit '
bdd4c31a22b9a5395e9d727e9f39ce1dc689c0a7':
DO NOT MERGE setAvrcpAbsoluteVolume is passed wrong unit parameter from AudioManager
Craig Mautner [Fri, 14 Mar 2014 00:40:20 +0000 (00:40 +0000)]
Merge "Fix activities appearing behind launcher icons" into klp-dev
Jeff Brown [Fri, 14 Mar 2014 00:40:20 +0000 (00:40 +0000)]
am
db3146c0: am
15258ac8: Fix power manager display wake lock bugs. (DO NOT MERGE)
* commit '
db3146c039750f68418e0908037a8bed3890913c':
Fix power manager display wake lock bugs. (DO NOT MERGE)
Adam Powell [Fri, 14 Mar 2014 00:40:11 +0000 (00:40 +0000)]
am
898d6d96: am
7f2c9e94: Merge "Add a config override for ViewConfiguration#hasPermanentMenuKey" into klp-dev
* commit '
898d6d964cb3b650b5c9bed2276310547e5455e0':
Add a config override for ViewConfiguration#hasPermanentMenuKey
Dave Platt [Thu, 13 Mar 2014 23:41:28 +0000 (23:41 +0000)]
am
21384faa: am
f3a2895a: Merge "NsdService does not clean up after exiting clients"
* commit '
21384faa2b3da619a54b35f15936c00593b30694':
NsdService does not clean up after exiting clients
Dave Platt [Thu, 13 Mar 2014 23:38:59 +0000 (16:38 -0700)]
am
f3a2895a: Merge "NsdService does not clean up after exiting clients"
* commit '
f3a2895a31069a7c01c69d011b290fcfb3298b3c':
NsdService does not clean up after exiting clients
Dave Platt [Thu, 13 Mar 2014 23:35:15 +0000 (23:35 +0000)]
Merge "NsdService does not clean up after exiting clients"
Mike Lockwood [Thu, 13 Mar 2014 23:34:46 +0000 (23:34 +0000)]
am
381374b3: Merge "UsbDeviceManager: Fix race condition between accessory start and USB configured uevents" into klp-dev
* commit '
381374b3cd66f364fd644c21f2d9128bcde2f58a':
UsbDeviceManager: Fix race condition between accessory start and USB configured uevents
Mike Lockwood [Thu, 13 Mar 2014 23:32:17 +0000 (23:32 +0000)]
Merge "UsbDeviceManager: Fix race condition between accessory start and USB configured uevents" into klp-dev
Dave Platt [Fri, 7 Mar 2014 22:48:22 +0000 (14:48 -0800)]
NsdService does not clean up after exiting clients
When a client of the NsdService exits, NsdService should
clean up the requests it has sent to the mDNS daemon:
cancel any pending resource-discovery and resource-resolution
queries, and remove any services registered by this client.
If this isn't done, several bad things happen. The daemon will
continue to run unnecessarily, will report service discoveries
that can't be forwarded on to the client, and will continue to
advertise service ports for an application which is no longer
running until the device is rebooted (mDNS pollution).
Bug:
9801184
Change-Id: I0aa7311480322aefcff16f902fbbf34f50985d38
Craig Mautner [Thu, 13 Mar 2014 23:16:20 +0000 (16:16 -0700)]
Fix activities appearing behind launcher icons
cherry picked from
d5c91ece7bfea74ee7ab2bc86f3cb3f5c531f866
Change-Id: I76d20398e71c1be4accfaed6b0791674197b4fb0
Brian Carlstrom [Thu, 13 Mar 2014 23:04:18 +0000 (16:04 -0700)]
resolved conflicts for merge of
9af19bee to klp-dev-plus-aosp
Change-Id: I70f34a6523fb43129cfe7d4c7308bc3b7353f57c
Ricardo Cervera [Thu, 13 Mar 2014 22:25:20 +0000 (22:25 +0000)]
am
7e566239: Merge "docs: Updated Building your First App tutorial. Bug:
13429905" into klp-docs
* commit '
7e566239656c1de32a3bf695cd2ea3a28f1e906b':
docs: Updated Building your First App tutorial. Bug:
13429905
Ricardo Cervera [Thu, 13 Mar 2014 22:21:44 +0000 (22:21 +0000)]
Merge "docs: Updated Building your First App tutorial. Bug:
13429905" into klp-docs
Joe Fernandez [Thu, 13 Mar 2014 22:15:11 +0000 (22:15 +0000)]
am
f7267c8b: Merge "Doc change: Update developer video on home page carousel." into klp-docs
* commit '
f7267c8bdc5431d486e8bb34722d492be82e44f3':
Doc change: Update developer video on home page carousel.
John Spurlock [Thu, 13 Mar 2014 22:15:09 +0000 (22:15 +0000)]
am
6d9b034c: Fix typo in public logcat page.
* commit '
6d9b034ce169eeaa7e49574f4694ec96651c7f4e':
Fix typo in public logcat page.
Ricardo Cervera [Thu, 13 Mar 2014 22:15:06 +0000 (22:15 +0000)]
am
ef6c9470: Merge "docs: Added step to get JDK to the Android Studio install instructions." into klp-docs
* commit '
ef6c94700589958789039749248895a2631ebe55':
docs: Added step to get JDK to the Android Studio install instructions.
Katie McCormick [Thu, 13 Mar 2014 22:15:01 +0000 (22:15 +0000)]
am
07c0ad97: Merge "Doc update: new doc studio layout editor" into klp-docs
* commit '
07c0ad973a2fdd8a35b3627e69f1134673c8b8e0':
Doc update: new doc studio layout editor
John Spurlock [Thu, 13 Mar 2014 22:14:57 +0000 (22:14 +0000)]
am
f6228d95: Merge "Fix doc typos in AppOpsManager.java" into klp-docs
* commit '
f6228d95eae7b05dd0015b3062e72c89148e65a2':
Fix doc typos in AppOpsManager.java
Ricardo Cervera [Wed, 12 Mar 2014 23:02:51 +0000 (16:02 -0700)]
docs: Updated Building your First App tutorial. Bug:
13429905
-Updated default code in activities from ADT
-Updated screenshots for ADT wizards when changed
-Updated activity_ with fragment_ where required
-Other minor changes
Stage: http://quixote.mtv:8004/training/basics/firstapp/creating-project.html
Patch: Removed border from the new ADT screenshots.
Patch: Replaced device screenshots using an Android 4.4 device.
Patch: Addressed Katie's comments.
Change-Id: Ic0acf714b1b5913f1f82d6eafac53666a721dfe4
JP Abgrall [Thu, 13 Mar 2014 20:36:51 +0000 (20:36 +0000)]
am
7baa7c80: Merge "ConnectivityService: add support to set TCP initial rwnd" into klp-dev
* commit '
7baa7c804501b9cbcb5de281c5ddfaf03ba08f7a':
ConnectivityService: add support to set TCP initial rwnd
JP Abgrall [Thu, 13 Mar 2014 20:33:43 +0000 (20:33 +0000)]
Merge "ConnectivityService: add support to set TCP initial rwnd" into klp-dev
Chad Brubaker [Thu, 13 Mar 2014 18:12:36 +0000 (18:12 +0000)]
am
8e240af5: Merge "Remove SO_BINDTODEVICE from VPN protect" into klp-dev
* commit '
8e240af51df5d7b793f4ae54ce6ff4795ee9f6ac':
Remove SO_BINDTODEVICE from VPN protect
Chad Brubaker [Thu, 13 Mar 2014 18:09:57 +0000 (18:09 +0000)]
Merge "Remove SO_BINDTODEVICE from VPN protect" into klp-dev
Svetoslav [Thu, 13 Mar 2014 17:31:03 +0000 (17:31 +0000)]
am
11b7d9fa: Merge "PrintSpooler crash if printer is reported to have only one color mode." into klp-dev
* commit '
11b7d9fa6685e742f5b3e3235a8e6e4920dbed02':
PrintSpooler crash if printer is reported to have only one color mode.
Svetoslav [Thu, 13 Mar 2014 17:26:44 +0000 (17:26 +0000)]
Merge "PrintSpooler crash if printer is reported to have only one color mode." into klp-dev
Adrian Roos [Thu, 13 Mar 2014 17:26:26 +0000 (17:26 +0000)]
am
cd0d8cb2: Merge "DO NOT MERGE - Fix keyguard pattern lockout bug" into klp-dev
* commit '
cd0d8cb2d97ced5e8110a14f5cf4bc2d4fe68440':
DO NOT MERGE - Fix keyguard pattern lockout bug
Adrian Roos [Thu, 13 Mar 2014 17:22:58 +0000 (17:22 +0000)]
Merge "DO NOT MERGE - Fix keyguard pattern lockout bug" into klp-dev
Joe Fernandez [Thu, 13 Mar 2014 17:15:16 +0000 (17:15 +0000)]
Merge "Doc change: Update developer video on home page carousel." into klp-docs
John Spurlock [Thu, 13 Mar 2014 16:40:12 +0000 (12:40 -0400)]
Fix typo in public logcat page.
Change-Id: I3b2c9ab53c305ecbb93579be474dc85462d3e2e2
Baligh Uddin [Thu, 13 Mar 2014 16:25:45 +0000 (16:25 +0000)]
am
4545b1d2: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
4545b1d29b23cbfe11aa7ca6b54f6518a38db278':
Import translations. DO NOT MERGE
Ricardo Cervera [Thu, 13 Mar 2014 16:23:31 +0000 (16:23 +0000)]
Merge "docs: Added step to get JDK to the Android Studio install instructions." into klp-docs
Baligh Uddin [Thu, 13 Mar 2014 16:22:52 +0000 (16:22 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev
Adrian Roos [Mon, 10 Mar 2014 16:00:11 +0000 (17:00 +0100)]
DO NOT MERGE - Fix keyguard pattern lockout bug
(cherry picked from commit
7c11f8b4659c3444d5037b756b6e5f45a2ea61a6)
Conflicts:
packages/Keyguard/src/com/android/keyguard/KeyguardPatternView.java
Bug:
13302967
Change-Id: Ifa4c01e630bd3aa8cadfea8dbbbb4686d50eb945
Deepanshu Gupta [Thu, 13 Mar 2014 03:40:01 +0000 (20:40 -0700)]
resolved conflicts for merge of
c76345a3 to klp-dev-plus-aosp
Change-Id: I54e14e1c6cd53cd10b38b34cf31989a2aa487b83
JP Abgrall [Fri, 21 Feb 2014 20:05:20 +0000 (12:05 -0800)]
ConnectivityService: add support to set TCP initial rwnd
The value for the TCP initial receive window comes from,
in order,
kernel
/proc/sys/net/ipv4/tcp_default_init_rwnd
init.rc (via properties)
net.tcp.default_init_rwnd
properties
net.tcp.default_init_rwnd
gservices
Settings.Global.TCP_DEFAULT_INIT_RWND
Bug:
12020135
Change-Id: I0e271be19472900fa9f3bab037d53383ec014a9e
Narayan Kamath [Thu, 13 Mar 2014 01:55:28 +0000 (01:55 +0000)]
am
b071a07d: am
a79af364: Merge "Remove java.io.tmpdir assignment in AndroidRuntime (again)."
* commit '
b071a07da89a8736fa4fd757f9a6c6e990d0e858':
Remove java.io.tmpdir assignment in AndroidRuntime (again).
Narayan Kamath [Thu, 13 Mar 2014 01:55:20 +0000 (01:55 +0000)]
am
194e77aa: am
0f3fd6c6: Merge "Remove stray logging statement."
* commit '
194e77aafe32cacc00f69b25bec6eeea67eb0205':
Remove stray logging statement.
Jeff Brown [Thu, 13 Mar 2014 01:54:59 +0000 (01:54 +0000)]
am
fc7315c6: am
6d71e165: Merge "Round off when calculate next step in Seekbar"
* commit '
fc7315c6c17e6ebc559d2ea0afb8be64c5d7b86c':
Round off when calculate next step in Seekbar
Jeff Brown [Thu, 13 Mar 2014 01:54:56 +0000 (01:54 +0000)]
am
33282d66: am
a41ddccd: Merge "Fixed typo errors in documentation"
* commit '
33282d66155e8d68acea512989ec61cb15fae1ce':
Fixed typo errors in documentation
Jeff Brown [Thu, 13 Mar 2014 01:54:53 +0000 (01:54 +0000)]
am
aaf23a9a: am
c3f5d694: Merge "Hang off call by power button while screen is on"
* commit '
aaf23a9a653457cccf54293b2ff76196718c7a1a':
Hang off call by power button while screen is on
Jeff Brown [Thu, 13 Mar 2014 01:54:47 +0000 (01:54 +0000)]
am
e7f7af96: am
35c8ebab: Merge "take account of RotationVector\'s new extra parameter"
* commit '
e7f7af964baa3c5d36abd163e33ad139310049d2':
take account of RotationVector's new extra parameter
Dianne Hackborn [Thu, 13 Mar 2014 01:15:22 +0000 (01:15 +0000)]
am
a796168d: Merge "Fix issue #
11965706: Calls using IntentChooser are now Broken in 4.3 and 4.4" into klp-dev
* commit '
a796168da0ea139fe7312678f5031cd96c50097c':
Fix issue #
11965706: Calls using IntentChooser are now Broken in 4.3 and 4.4
Dianne Hackborn [Thu, 13 Mar 2014 01:12:13 +0000 (01:12 +0000)]
Merge "Fix issue #
11965706: Calls using IntentChooser are now Broken in 4.3 and 4.4" into klp-dev
Jianzheng Zhou [Thu, 10 Oct 2013 06:02:09 +0000 (14:02 +0800)]
remove unnecessary switchUser call
If userId doesn't change, no need to do switchuser.or it will
introduce some tweak for gps modules in quick off/on because
they need cost time in off/on.
Change-Id: Ie5e408dc8be69c8a63a18bcb2cfe478cef4d70e6
Signed-off-by: Jianzheng Zhou <jianzheng.zhou@freescale.com>
Dirk Dougherty [Thu, 13 Mar 2014 00:41:23 +0000 (17:41 -0700)]
Doc change: Update developer video on home page carousel.
Change-Id: Ic0cc5f38d8f8b161839585b46dbe3b3b1e1f4942
Jeff Brown [Thu, 13 Mar 2014 00:15:19 +0000 (00:15 +0000)]
am
73bd57f7: Merge "Retain display when creating specialized contexts. (DO NOT MERGE)" into klp-dev
* commit '
73bd57f7abdb9eaf9239aa13945990acc6c97cd2':
Retain display when creating specialized contexts. (DO NOT MERGE)
Jeff Brown [Thu, 13 Mar 2014 00:12:52 +0000 (00:12 +0000)]
Merge "Retain display when creating specialized contexts. (DO NOT MERGE)" into klp-dev
Ricardo Cervera [Mon, 10 Mar 2014 19:48:00 +0000 (12:48 -0700)]
docs: Added step to get JDK to the Android Studio install instructions.
Bug:
13353010
Stage: http://quixote.mtv:8002/sdk/installing/studio.html
Patch: Addressed Scott's comments.
Patch: Addressed Scott's comments.
Change-Id: Iabbe0ddbcfab93e1c5fbbcb222c52bb47662850a
Zhihai Xu [Wed, 12 Mar 2014 23:25:11 +0000 (23:25 +0000)]
am
60d7c995: Merge "DO NOT MERGE setAvrcpAbsoluteVolume is passed wrong unit parameter from AudioManager" into klp-dev
* commit '
60d7c9957891280dfb131d5d58f32cf6fb82d5a2':
DO NOT MERGE setAvrcpAbsoluteVolume is passed wrong unit parameter from AudioManager
Zhihai Xu [Wed, 12 Mar 2014 23:22:37 +0000 (23:22 +0000)]
Merge "DO NOT MERGE setAvrcpAbsoluteVolume is passed wrong unit parameter from AudioManager" into klp-dev
Naofumi Harada [Wed, 12 Mar 2014 23:21:09 +0000 (23:21 +0000)]
am
3b182261: am
68c0346b: DO NOT MERGE - FLAG_PRIVILEGED disappears if privileged app is updated and rebooted
* commit '
3b18226133f27a5fe9e18f7da17d4cd0d0fa0471':
DO NOT MERGE - FLAG_PRIVILEGED disappears if privileged app is updated and rebooted
Chad Brubaker [Wed, 12 Mar 2014 23:21:05 +0000 (23:21 +0000)]
am
7fb07438: am
674f85af: Merge "Only allow System apps to make VPN exempt routes" into klp-dev
* commit '
7fb074389370ac93afc5830189371dc3ec26265c':
Only allow System apps to make VPN exempt routes
Chad Brubaker [Wed, 12 Mar 2014 23:21:02 +0000 (23:21 +0000)]
am
1011960c: am
decfd707: Merge "Add the calling package name to requestRouteToHost" into klp-dev
* commit '
1011960c44a4f84d53d05199fe1ca09be9473822':
Add the calling package name to requestRouteToHost
Zhihai Xu [Sat, 11 Jan 2014 00:44:39 +0000 (16:44 -0800)]
DO NOT MERGE setAvrcpAbsoluteVolume is passed wrong unit parameter from AudioManager
setAvrcpAbsoluteVolume is passed wrong unit parameter from AudioManager.
It cause maximize volume in Bluetooth speaker/device.
The volume expected by Bluetooth Avrcp should be from 0 to 15.
But the current volume parameter passed to Bluetooth Avrcp is from 0 to 150.
It is scaled by 10 times than the correct volume.
index = rescaleIndex(index * 10, streamType, streamTypeAlias);
Should divide the volume by 10 before pass to Bluetooth Avrcp.
bug:
12495379
Change-Id: I4160588e92ee384e21a75d63036d8bd6ccb30621
Svetoslav [Thu, 2 Jan 2014 19:23:44 +0000 (11:23 -0800)]
PrintSpooler crash if printer is reported to have only one color mode.
bug:
11993304
Change-Id: I4932cf1b5b9b89f0cbf97011782ede037e7d814c
(cherry picked from commit
b0d97b87ba5f23ee867f381a4e5916ebb2e5f762)
Christopher Tate [Wed, 12 Mar 2014 20:40:17 +0000 (20:40 +0000)]
am
87503f85: am
e9821bf2: Merge "DO NOT MERGE - Don\'t hang installs if the transport disappears" into klp-dev
* commit '
87503f8561296fea489f8a3fe8384f61150976da':
DO NOT MERGE - Don't hang installs if the transport disappears
Baligh Uddin [Wed, 12 Mar 2014 20:40:14 +0000 (20:40 +0000)]
am
c6ccb8a3: (-s ours) am
7138395b: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
c6ccb8a3d436f2cfe563daf78a5c6706cb7d4274':
Import translations. DO NOT MERGE
Jeff Brown [Wed, 12 Mar 2014 18:49:09 +0000 (18:49 +0000)]
am
15258ac8: Fix power manager display wake lock bugs. (DO NOT MERGE)
* commit '
15258ac86bb397206ac44c073baf184ffa0e62f2':
Fix power manager display wake lock bugs. (DO NOT MERGE)
Dianne Hackborn [Wed, 12 Mar 2014 18:10:08 +0000 (11:10 -0700)]
Fix issue #
11965706: Calls using IntentChooser are now Broken in 4.3 and 4.4
The activity manager needs to set launchedFromPackage to be that of
the previous package in the case where flow has been redirected
through an intermediate activity.
Change-Id: I678fc2e7d984991ac715251a784ba7d7ccbf9fca
Baligh Uddin [Wed, 12 Mar 2014 16:09:05 +0000 (09:09 -0700)]
Import translations. DO NOT MERGE
Change-Id: I2b0385f74777c70bda7e2962777c1c96767bd222
Auto-generated-cl: translation import
Jeff Brown [Wed, 12 Mar 2014 06:02:35 +0000 (23:02 -0700)]
Fix power manager display wake lock bugs. (DO NOT MERGE)
Under certain circumstances, the power manager might continue to
hold the display wakelock long after the display had been turned
off due to the mDisplayReady flag having an incorrect value.
1. An inverted conditional caused DisplayPowerState to incorrectly
signal the screen on ready state.
2. The DisplayPowerController failed to clear the block screen on
flag in the case where the screen was turned off before it became
unblocked from turning on. This could happen when the display was
rapidly turned on-off-on-off.
Bug:
13248135
Change-Id: I8faa3034695c83c8cd35613d81acccf40d22128d
Jeff Brown [Tue, 11 Mar 2014 04:24:37 +0000 (21:24 -0700)]
Retain display when creating specialized contexts. (DO NOT MERGE)
Fixed a bug that cause Context.createPackageContext() to discard
display information. Likewise also fixes issues where the
activity token, override configuration, user handle, and
restriction state might be discarded.
As part of this change, reworked how Contexts are created to make
initialization easier to understand and less error-prone.
The init() methods have been removed and most of the state is
now stored in final variables.
Bug:
12015587
Change-Id: If795851f1cd078bef889b76a52e00d9b3c06ab11
Adam Powell [Tue, 11 Mar 2014 23:26:38 +0000 (23:26 +0000)]
am
7f2c9e94: Merge "Add a config override for ViewConfiguration#hasPermanentMenuKey" into klp-dev
* commit '
7f2c9e9420252a493b7399639f794c8a963444e5':
Add a config override for ViewConfiguration#hasPermanentMenuKey
Adam Powell [Tue, 11 Mar 2014 23:19:37 +0000 (23:19 +0000)]
Merge "Add a config override for ViewConfiguration#hasPermanentMenuKey" into klp-dev
Narayan Kamath [Tue, 11 Mar 2014 23:18:18 +0000 (23:18 +0000)]
am
52af2ca9: DO NOT MERGE - Remove data dirs if a new install fails dexopt.
* commit '
52af2ca919c068f1c9389fa4c979d2fe3105af40':
DO NOT MERGE - Remove data dirs if a new install fails dexopt.
Naofumi Harada [Tue, 11 Mar 2014 23:18:00 +0000 (23:18 +0000)]
am
68c0346b: DO NOT MERGE - FLAG_PRIVILEGED disappears if privileged app is updated and rebooted
* commit '
68c0346b22d11a0e2c5e89f1a9206bc06ad3d0cf':
DO NOT MERGE - FLAG_PRIVILEGED disappears if privileged app is updated and rebooted
Deepanshu Gupta [Tue, 11 Mar 2014 23:16:18 +0000 (16:16 -0700)]
am
792f38dd: Merge "Fix the delegate method signatures in LayoutLib"
* commit '
792f38ddd9e8d25b2c8bf0d67363dbfa56550636':
Fix the delegate method signatures in LayoutLib
Alan Viverette [Tue, 11 Mar 2014 23:05:12 +0000 (23:05 +0000)]
am
9ebe031c: am
6e6dc23c: Merge "DO NOT MERGE Quick fix for updating the FastScroller long list property" into klp-dev
* commit '
9ebe031cdc916646e95ffcd92dde67e1655be7ba':
DO NOT MERGE Quick fix for updating the FastScroller long list property
Alan Viverette [Tue, 11 Mar 2014 23:05:03 +0000 (23:05 +0000)]
am
7b09a4e5: am
e910a7ce: Merge "DO NOT MERGE Check item type before re-binding transient state views" into klp-dev
* commit '
7b09a4e5df908783a95dbfef3bc9fabda339c3a1':
DO NOT MERGE Check item type before re-binding transient state views
Alan Viverette [Tue, 11 Mar 2014 23:05:00 +0000 (23:05 +0000)]
am
3c3377a2: am
6a5b7c6f: Merge "DO NOT MERGE Ensure transient state views are temporarily detached" into klp-dev
* commit '
3c3377a2290764937548de5a49ca8ec28dc98153':
DO NOT MERGE Ensure transient state views are temporarily detached
Adam Powell [Tue, 11 Mar 2014 23:04:56 +0000 (23:04 +0000)]
am
75958c29: am
3a153c0d: Merge "Fix a bug in submenu presenter priority handling" into klp-dev
* commit '
75958c298477a3d1e556c4fe36e516b9e828c311':
Fix a bug in submenu presenter priority handling
Jason Sams [Tue, 11 Mar 2014 23:04:52 +0000 (23:04 +0000)]
am
780d57b8: am
cf8573c1: Fix destruction issues relating to AllocationAdapter.
* commit '
780d57b81ac1a9af6ae533f5039cd91a662b49f4':
Fix destruction issues relating to AllocationAdapter.
Jason Sams [Tue, 11 Mar 2014 23:04:49 +0000 (23:04 +0000)]
am
e14d5e90: am
5757bf89: Add hidden minor version ID for support lib workarounds.
* commit '
e14d5e901172559a5e18077bde3ccafd03e8a6e2':
Add hidden minor version ID for support lib workarounds.