OSDN Git Service
Katie McCormick [Fri, 14 Mar 2014 16:32:27 +0000 (16:32 +0000)]
am
8e142bbb: am
b681794d: am
07c0ad97: Merge "Doc update: new doc studio layout editor" into klp-docs
* commit '
8e142bbbe19c2f485033eace102d2e950ceeb4fb':
Doc update: new doc studio layout editor
John Spurlock [Fri, 14 Mar 2014 16:32:24 +0000 (16:32 +0000)]
am
75985bbe: am
62826f55: am
f6228d95: Merge "Fix doc typos in AppOpsManager.java" into klp-docs
* commit '
75985bbe2f04519cc663db7ad54e8e69f3eabfc0':
Fix doc typos in AppOpsManager.java
JP Abgrall [Fri, 14 Mar 2014 16:32:21 +0000 (16:32 +0000)]
am
4f261396: am
4ecd833e: am
7baa7c80: Merge "ConnectivityService: add support to set TCP initial rwnd" into klp-dev
* commit '
4f26139661b0039cff5e570975e6bf9b0bbce1af':
ConnectivityService: add support to set TCP initial rwnd
Chad Brubaker [Fri, 14 Mar 2014 16:32:18 +0000 (16:32 +0000)]
am
7c2b1625: am
78f204ae: am
8e240af5: Merge "Remove SO_BINDTODEVICE from VPN protect" into klp-dev
* commit '
7c2b1625d66d3c80c313160f78c8bccd9499539e':
Remove SO_BINDTODEVICE from VPN protect
Svetoslav [Fri, 14 Mar 2014 16:32:15 +0000 (16:32 +0000)]
am
358eaa78: am
fc1d0471: am
11b7d9fa: Merge "PrintSpooler crash if printer is reported to have only one color mode." into klp-dev
* commit '
358eaa7825140ee571a7b9d61705fb3adb5b60aa':
PrintSpooler crash if printer is reported to have only one color mode.
Adrian Roos [Fri, 14 Mar 2014 16:32:12 +0000 (16:32 +0000)]
am
70a0ea0e: am
16858164: am
cd0d8cb2: Merge "DO NOT MERGE - Fix keyguard pattern lockout bug" into klp-dev
* commit '
70a0ea0e8de981a2a0c3fb296718256a2355ee2d':
DO NOT MERGE - Fix keyguard pattern lockout bug
Baligh Uddin [Fri, 14 Mar 2014 16:32:05 +0000 (16:32 +0000)]
am
46bfaa1b: (-s ours) am
a5a921e3: (-s ours) am
4545b1d2: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
46bfaa1b93068c78ea5a2ab337ea8b98592b7c10':
Import translations. DO NOT MERGE
Dianne Hackborn [Fri, 14 Mar 2014 16:32:02 +0000 (16:32 +0000)]
am
d4981014: am
e5191aab: am
a796168d: Merge "Fix issue #
11965706: Calls using IntentChooser are now Broken in 4.3 and 4.4" into klp-dev
* commit '
d4981014d486c3ff72813d0d37048ee2abdb3d63':
Fix issue #
11965706: Calls using IntentChooser are now Broken in 4.3 and 4.4
Jeff Brown [Fri, 14 Mar 2014 16:31:59 +0000 (16:31 +0000)]
am
6adc9602: am
825dd9dd: am
73bd57f7: Merge "Retain display when creating specialized contexts. (DO NOT MERGE)" into klp-dev
* commit '
6adc96020f763289d2e2a33b612f2ff237fb40b6':
Retain display when creating specialized contexts. (DO NOT MERGE)
Katie McCormick [Fri, 14 Mar 2014 16:28:18 +0000 (16:28 +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 16:28:15 +0000 (16:28 +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 16:28:09 +0000 (16:28 +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 16:27:58 +0000 (16:27 +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 16:27:55 +0000 (16:27 +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 16:27:51 +0000 (16:27 +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 16:27:44 +0000 (16:27 +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 16:27:40 +0000 (16:27 +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 16:27:35 +0000 (16:27 +0000)]
am
825dd9dd: am
73bd57f7: Merge "Retain display when creating specialized contexts. (DO NOT MERGE)" into klp-dev
* commit '
825dd9dd38a42306d18a627768b16204cf4d8710':
Retain display when creating specialized contexts. (DO NOT MERGE)
Zhihai Xu [Fri, 14 Mar 2014 16:01:00 +0000 (16:01 +0000)]
am
57080be9: am
bdd4c31a: am
60d7c995: Merge "DO NOT MERGE setAvrcpAbsoluteVolume is passed wrong unit parameter from AudioManager" into klp-dev
* commit '
57080be98e6c8d33781c619b79731264ab909baf':
DO NOT MERGE setAvrcpAbsoluteVolume is passed wrong unit parameter from AudioManager
Zhihai Xu [Fri, 14 Mar 2014 15:56:47 +0000 (15:56 +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
Narayan Kamath [Fri, 14 Mar 2014 14:22:30 +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
Jeff Brown [Fri, 14 Mar 2014 04:12:08 +0000 (04:12 +0000)]
am
6ae4d53b: resolved conflicts for merge of
db3146c0 to klp-modular-dev
* commit '
6ae4d53b571cb71cc6c2ad55d12679d22e9334d5':
Fix power manager display wake lock bugs. (DO NOT MERGE)
Jeff Brown [Fri, 14 Mar 2014 04:07:33 +0000 (21:07 -0700)]
resolved conflicts for merge of
db3146c0 to klp-modular-dev
Change-Id: I1500228392add2de325b9530ae33d7c3e738c021
Adam Powell [Thu, 13 Mar 2014 23:57:19 +0000 (23:57 +0000)]
am
41685ce9: am
898d6d96: am
7f2c9e94: Merge "Add a config override for ViewConfiguration#hasPermanentMenuKey" into klp-dev
* commit '
41685ce983abd6b4ccbb0ae8043d6a1dc118f7d3':
Add a config override for ViewConfiguration#hasPermanentMenuKey
Adam Powell [Thu, 13 Mar 2014 23:53:38 +0000 (23:53 +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:42:03 +0000 (23:42 +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"
Brian Carlstrom [Thu, 13 Mar 2014 23:31:14 +0000 (16:31 -0700)]
resolved conflicts for merge of
aa737c49 to klp-modular-dev-plus-aosp
Change-Id: I1f4e555773fe6138efaf73444525da0f747b01d5
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
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
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
Naofumi Harada [Thu, 13 Mar 2014 18:23:03 +0000 (18:23 +0000)]
am
03263ce3: am
3b182261: am
68c0346b: DO NOT MERGE - FLAG_PRIVILEGED disappears if privileged app is updated and rebooted
* commit '
03263ce38aaca11300595af19d313a9f6e3ead96':
DO NOT MERGE - FLAG_PRIVILEGED disappears if privileged app is updated and rebooted
Chad Brubaker [Thu, 13 Mar 2014 18:23:00 +0000 (18:23 +0000)]
am
74f99a4e: am
7fb07438: am
674f85af: Merge "Only allow System apps to make VPN exempt routes" into klp-dev
* commit '
74f99a4e904af56a62f86b81831c23c763b6001e':
Only allow System apps to make VPN exempt routes
Chad Brubaker [Thu, 13 Mar 2014 18:22:57 +0000 (18:22 +0000)]
am
f5729a6a: am
1011960c: am
decfd707: Merge "Add the calling package name to requestRouteToHost" into klp-dev
* commit '
f5729a6a1573ba27f69a5c5dc144be3f8f60b026':
Add the calling package name to requestRouteToHost
Narayan Kamath [Thu, 13 Mar 2014 18:18:48 +0000 (18:18 +0000)]
am
9af19bee: am
52af2ca9: DO NOT MERGE - Remove data dirs if a new install fails dexopt.
* commit '
9af19bee1c7da8d2e8bc6e40c6e9c1e28e0640c6':
DO NOT MERGE - Remove data dirs if a new install fails dexopt.
Naofumi Harada [Thu, 13 Mar 2014 18:18:45 +0000 (18:18 +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 [Thu, 13 Mar 2014 18:18:40 +0000 (18:18 +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 [Thu, 13 Mar 2014 18:18:36 +0000 (18:18 +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
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
Jose Lima [Thu, 13 Mar 2014 18:02:50 +0000 (18:02 +0000)]
am
91726f4e: Merge "Add banner attribute to app manifest" into klp-modular-dev
* commit '
91726f4ea7b60025490209ccb2637d712e8d75fd':
Add banner attribute to app manifest
Christopher Tate [Thu, 13 Mar 2014 18:02:45 +0000 (18:02 +0000)]
am
aaaeb6a2: am
87503f85: am
e9821bf2: Merge "DO NOT MERGE - Don\'t hang installs if the transport disappears" into klp-dev
* commit '
aaaeb6a21bb6cc540fefa6868493bda612a63f22':
DO NOT MERGE - Don't hang installs if the transport disappears
Baligh Uddin [Thu, 13 Mar 2014 18:02:42 +0000 (18:02 +0000)]
am
4c9ebc4c: (-s ours) am
c6ccb8a3: (-s ours) am
7138395b: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
4c9ebc4c149627e4ea0ee82f053628021ef8bfe8':
Import translations. DO NOT MERGE
Alan Viverette [Thu, 13 Mar 2014 18:02:17 +0000 (18:02 +0000)]
am
cf2b65ce: am
9ebe031c: am
6e6dc23c: Merge "DO NOT MERGE Quick fix for updating the FastScroller long list property" into klp-dev
* commit '
cf2b65ce7a5a1d60755a00ae4da6cd6b1101af8c':
DO NOT MERGE Quick fix for updating the FastScroller long list property
Alan Viverette [Thu, 13 Mar 2014 18:02:14 +0000 (18:02 +0000)]
am
c25dbb50: am
7b09a4e5: am
e910a7ce: Merge "DO NOT MERGE Check item type before re-binding transient state views" into klp-dev
* commit '
c25dbb50c30816c97227b9a26cc46afec4e5318e':
DO NOT MERGE Check item type before re-binding transient state views
Alan Viverette [Thu, 13 Mar 2014 18:02:11 +0000 (18:02 +0000)]
am
af6288b7: am
3c3377a2: am
6a5b7c6f: Merge "DO NOT MERGE Ensure transient state views are temporarily detached" into klp-dev
* commit '
af6288b721110ffc4b4e68d55398b5ca31fc32e8':
DO NOT MERGE Ensure transient state views are temporarily detached
Adam Powell [Thu, 13 Mar 2014 18:02:08 +0000 (18:02 +0000)]
am
68ec033b: am
75958c29: am
3a153c0d: Merge "Fix a bug in submenu presenter priority handling" into klp-dev
* commit '
68ec033b7c9ea28155bbb007b01d5dbce2239392':
Fix a bug in submenu presenter priority handling
Jason Sams [Thu, 13 Mar 2014 18:02:03 +0000 (18:02 +0000)]
am
0ebc6b37: (-s ours) Force merge of remaining KLP changes to fix build.
* commit '
0ebc6b378dca76b3253b10cf17c3a38a0a50c073':
Force merge of remaining KLP changes to fix build.
Jose Lima [Thu, 13 Mar 2014 17:40:36 +0000 (17:40 +0000)]
Merge "Add banner attribute to app manifest" into klp-modular-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
Christopher Tate [Thu, 13 Mar 2014 17:19:17 +0000 (17:19 +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 [Thu, 13 Mar 2014 17:19:14 +0000 (17:19 +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
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
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
Jason Sams [Thu, 13 Mar 2014 10:50:19 +0000 (10:50 +0000)]
am
fc15f899: Fix build issues from bad merge
* commit '
fc15f899b86aa39bd32e3d38a9f5369ee8f0e2c8':
Fix build issues from bad merge
Jason Sams [Thu, 13 Mar 2014 10:50:15 +0000 (10:50 +0000)]
am
632c915c: resolved conflicts for merge of
780d57b8 to klp-modular-dev
* commit '
632c915ce8675033bbb7d356239d16594b26dffb':
Fix destruction issues relating to AllocationAdapter.
Alan Viverette [Thu, 13 Mar 2014 10:01:39 +0000 (10:01 +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 [Thu, 13 Mar 2014 10:01:35 +0000 (10:01 +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 [Thu, 13 Mar 2014 10:01:30 +0000 (10:01 +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 [Thu, 13 Mar 2014 10:01:15 +0000 (10:01 +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 [Thu, 13 Mar 2014 09:12:14 +0000 (09:12 +0000)]
am
280db650: am
e14d5e90: am
5757bf89: Add hidden minor version ID for support lib workarounds.
* commit '
280db65032fe0ed6897bc33c627ae176daecb1c2':
Add hidden minor version ID for support lib workarounds.
Jason Sams [Thu, 13 Mar 2014 09:12:09 +0000 (09:12 +0000)]
am
7f8a4107: am
0165db38: (-s ours) am
ff7256e7: Fix destruction issues relating to AllocationAdapter.
* commit '
7f8a41079c342ff1f4f0ba3bf8e4f4e203da2649':
Fix destruction issues relating to AllocationAdapter.
Jason Sams [Thu, 13 Mar 2014 08:49:05 +0000 (01:49 -0700)]
Force merge of remaining KLP changes to fix build.
Change-Id: I389a23c6615663c325980fcb30350ea6635d2d17
Jason Sams [Thu, 13 Mar 2014 08:17:49 +0000 (01:17 -0700)]
Fix build issues from bad merge
Change-Id: I6ebac7c87b807a8ed2fbeac895c1db8b199f715a
Jason Sams [Thu, 13 Mar 2014 07:39:04 +0000 (00:39 -0700)]
resolved conflicts for merge of
780d57b8 to klp-modular-dev
Change-Id: Idf2f939c25c342fff98da6b83be875d7708deba0
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
Jason Sams [Thu, 13 Mar 2014 01:35:42 +0000 (01:35 +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.
Jason Sams [Thu, 13 Mar 2014 01:35:38 +0000 (01:35 +0000)]
am
0165db38: (-s ours) am
ff7256e7: Fix destruction issues relating to AllocationAdapter.
* commit '
0165db3802f0fafe0ad86b7699be7adaea6686da':
Fix destruction issues relating to AllocationAdapter.
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
Jose Lima [Thu, 6 Mar 2014 20:13:15 +0000 (12:13 -0800)]
Add banner attribute to app manifest
Change-Id: I28b0dc6dee9623ec7534bb0e741b88f439b48c9f
Michael Wright [Thu, 13 Mar 2014 00:40:03 +0000 (00:40 +0000)]
am
d23d916e: Merge "Controllers must have buttons and a movement mechanism." into klp-modular-dev
* commit '
d23d916e0fc573ccde8a622aaa42ccfae9d31f82':
Controllers must have buttons and a movement mechanism.
Michael Wright [Thu, 13 Mar 2014 00:37:10 +0000 (00:37 +0000)]
Merge "Controllers must have buttons and a movement mechanism." into klp-modular-dev
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
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
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)
RoboErik [Wed, 12 Mar 2014 21:12:26 +0000 (21:12 +0000)]
am
ca9eef62: b/
12068020 Make kb layouts only unique to vendor/product. Do not merge
* commit '
ca9eef6203b7cfb0084f8305d4dcc5d70a7a25cd':
b/
12068020 Make kb layouts only unique to vendor/product. Do not merge
RoboErik [Wed, 12 Mar 2014 21:12:23 +0000 (21:12 +0000)]
am
c1e0015e: b/
12068020 Add a way to add uniqueness to device descriptors. Do not merge
* commit '
c1e0015ec3dfacc137cb500066020b25f18ecbb7':
b/
12068020 Add a way to add uniqueness to device descriptors. Do not merge
RoboErik [Mon, 16 Dec 2013 19:27:55 +0000 (11:27 -0800)]
b/
12068020 Make kb layouts only unique to vendor/product. Do not merge
This is a cherry-pick of https://googleplex-android-review.git.corp.google.com/#/c/399886/
Instead of storing a kb layout per device descriptor (which is expected
to be unique), store it for each vendor/product. This way we can keep
a consistent layout between identical but physically different keyboards.
There are some corner cases this is expected to fail on, namely devices
that incorrectly have the same vendor/product id. Devices that don't
define a vendor/product id will continue to use the descriptor to store
layout files.
Change-Id: I1f2508561992080459310d5a644dad65a9c24f1a
RoboErik [Thu, 12 Dec 2013 01:02:46 +0000 (17:02 -0800)]
b/
12068020 Add a way to add uniqueness to device descriptors. Do not merge
Cherry pick from https://googleplex-android-review.git.corp.google.com/#/c/398226/
This adds an integer to the descriptor of devices without uniqely
identifying information. It will reuse values that are no longer
in use, so if you remove a single device and attach a different
identical device it will appear to be the same device.
TODO: Derive uniqueness from USB port when possible. This version
will generate different descriptors for each half of a USB keyboard
that shows up twice.
Change-Id: Ie628f19c01469f6ec2d354cd00000898ac6432fa
Michael Wright [Wed, 12 Mar 2014 19:56:51 +0000 (12:56 -0700)]
Controllers must have buttons and a movement mechanism.
Some devices have joystick axes or DPad keys, but no gamepad buttons
(or vice versa). We shouldn't count these as gamepads since games
can't really be expected to work with this setup in the general case.
Instead, require that a device has a movement mechanism (joystick
axes or DPad buttons), as well as at least one gamepad button before
considering it a controller.
Bug:
13432364
Change-Id: Ia113c8441557d4c858c1e5740a3e1c7e0e9fdcdd
Jeff Brown [Wed, 12 Mar 2014 19:19:12 +0000 (19:19 +0000)]
am
0575b185: Merge "Add a temporary hack to report screen on while dozing." into klp-modular-dev
* commit '
0575b185c618a79ede771389ed9a78436b5636bd':
Add a temporary hack to report screen on while dozing.
Jeff Brown [Wed, 12 Mar 2014 19:16:42 +0000 (19:16 +0000)]
Merge "Add a temporary hack to report screen on while dozing." into klp-modular-dev
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 08:57:51 +0000 (08:57 +0000)]
am
2d8a3908: Fix power manager display wake lock bugs.
* commit '
2d8a3908d2b0a74ccdecd97e86e7bfda1caa218e':
Fix power manager display wake lock bugs.