git.osdn.net Git - android-x86/frameworks-base.git/log

Steve Moyer [Sun, 16 Mar 2014 17:35:30 +0000 (17:35 +0000)]

am adb3a198: am 05d855de: am d93e7b24: Merge "Don\'t attempt to launch disabled activities in smoke test."

* commit 'adb3a198beb015ac505aecde585f0c8bca3a29e2':
Don't attempt to launch disabled activities in smoke test.

commit | commitdiff | tree

Steve Moyer [Sun, 16 Mar 2014 17:31:18 +0000 (17:31 +0000)]

am 05d855de: am d93e7b24: Merge "Don\'t attempt to launch disabled activities in smoke test."

* commit '05d855defe8610854592ddd7baf5644ac6d4da15':
Don't attempt to launch disabled activities in smoke test.

commit | commitdiff | tree

Steve Moyer [Sun, 16 Mar 2014 17:29:25 +0000 (10:29 -0700)]

am d93e7b24: Merge "Don\'t attempt to launch disabled activities in smoke test."

* commit 'd93e7b2424b7ab442065b0d9cecb8b72a9c5c8ed':
Don't attempt to launch disabled activities in smoke test.

commit | commitdiff | tree

Steve Moyer [Sun, 16 Mar 2014 17:26:43 +0000 (17:26 +0000)]

Merge "Don't attempt to launch disabled activities in smoke test."

commit | commitdiff | tree

Craig Mautner [Fri, 14 Mar 2014 23:57:24 +0000 (23:57 +0000)]

am 5b98618f: am ca0aba39: Merge commit \'54d5702c\' into manualmerge

* commit '5b98618f2471cbea8466ec5a4dea0a819a7c0f3c':
Fix incorrect setting of TaskRecord.frontOfTask. DO NOT MERGE.

commit | commitdiff | tree

Craig Mautner [Fri, 14 Mar 2014 23:54:46 +0000 (23:54 +0000)]

am ca0aba39: Merge commit \'54d5702c\' into manualmerge

* commit 'ca0aba399326886d1a39c2344bab296044ba5eb0':
Fix incorrect setting of TaskRecord.frontOfTask. DO NOT MERGE.

commit | commitdiff | tree

Craig Mautner [Fri, 14 Mar 2014 23:49:50 +0000 (16:49 -0700)]

Merge commit '54d5702c' into manualmerge

Conflicts:
services/core/java/com/android/server/am/TaskRecord.java

Change-Id: Id7bc15b6c3e47d8705c228b311c4d85a47c13dbe

commit | commitdiff | tree

Tim Kilbourn [Fri, 14 Mar 2014 23:37:55 +0000 (23:37 +0000)]

am 42dd0bb6: am 9539b4a0: Merge "FEATURE_LEANBACK implies that the device is a tv." into klp-modular-dev

* commit '42dd0bb6b506be81c76cffc7b6f5491c937d4e07':
FEATURE_LEANBACK implies that the device is a tv.

commit | commitdiff | tree

Marco Nelissen [Fri, 14 Mar 2014 23:37:52 +0000 (23:37 +0000)]

am 30260c7e: am 203a6ddb: am 105c4792: am 10a07a04: Merge "Verify certificates" into klp-dev

* commit '30260c7e93fa5d5a08c505e1b804849bb56b83f1':
Verify certificates

commit | commitdiff | tree

Daniel 2 Olofsson [Fri, 14 Mar 2014 23:37:49 +0000 (23:37 +0000)]

am 18306520: am 39fc43b0: am 4111e7e1: am 09421fab: Re-initialize error after attach

* commit '18306520d8afc168df78024d139ed189d8ff7cdb':
Re-initialize error after attach

commit | commitdiff | tree

Tim Kilbourn [Fri, 14 Mar 2014 23:33:11 +0000 (23:33 +0000)]

am 9539b4a0: Merge "FEATURE_LEANBACK implies that the device is a tv." into klp-modular-dev

* commit '9539b4a02f74b447db0e3aa1039229f6b913aa87':
FEATURE_LEANBACK implies that the device is a tv.

commit | commitdiff | tree

Marco Nelissen [Fri, 14 Mar 2014 23:33:02 +0000 (23:33 +0000)]

am 203a6ddb: am 105c4792: am 10a07a04: Merge "Verify certificates" into klp-dev

* commit '203a6ddb0c098821ff36511e2a98211a90a69954':
Verify certificates

commit | commitdiff | tree

Daniel 2 Olofsson [Fri, 14 Mar 2014 23:33:00 +0000 (23:33 +0000)]

am 39fc43b0: am 4111e7e1: am 09421fab: Re-initialize error after attach

* commit '39fc43b0f91e8d92fc4251e11384c4ea6544cf35':
Re-initialize error after attach

commit | commitdiff | tree

Tim Kilbourn [Fri, 14 Mar 2014 23:13:45 +0000 (23:13 +0000)]

Merge "FEATURE_LEANBACK implies that the device is a tv." into klp-modular-dev

commit | commitdiff | tree

Marco Nelissen [Fri, 14 Mar 2014 22:55:50 +0000 (22:55 +0000)]

am 105c4792: am 10a07a04: Merge "Verify certificates" into klp-dev

* commit '105c47924f7af9319ec9242b952b4bf074585229':
Verify certificates

commit | commitdiff | tree

Daniel 2 Olofsson [Fri, 14 Mar 2014 22:55:45 +0000 (22:55 +0000)]

am 4111e7e1: am 09421fab: Re-initialize error after attach

* commit '4111e7e17665b1142853c71e9fd1cf6af5f68b82':
Re-initialize error after attach

commit | commitdiff | tree

Craig Mautner [Fri, 14 Mar 2014 22:36:15 +0000 (22:36 +0000)]

am 477897ad: Merge "Fix incorrect setting of TaskRecord.frontOfTask. DO NOT MERGE." into klp-dev

* commit '477897ad7b0725fa68d32a94bf8c24264068fd5c':
Fix incorrect setting of TaskRecord.frontOfTask. DO NOT MERGE.

commit | commitdiff | tree

Marco Nelissen [Fri, 14 Mar 2014 22:32:02 +0000 (22:32 +0000)]

am 10a07a04: Merge "Verify certificates" into klp-dev

* commit '10a07a043f7fa47148ae2cc2fcd6b0edeb52190b':
Verify certificates

commit | commitdiff | tree

Craig Mautner [Fri, 14 Mar 2014 22:30:04 +0000 (22:30 +0000)]

Merge "Fix incorrect setting of TaskRecord.frontOfTask. DO NOT MERGE." into klp-dev

commit | commitdiff | tree

Craig Mautner [Mon, 16 Dec 2013 23:58:31 +0000 (15:58 -0800)]

Fix incorrect setting of TaskRecord.frontOfTask. DO NOT MERGE.

When Intent.FLAG_ACTIVITY_REORDER_TO_FRONT was set the TaskRecord
member frontOfTask was being set true incorrectly for the top
activity. It should only be true for the bottom activity. This fix
ensures that frontOfTask is always set correctly for all activities by
consoldating it into one method.

Fixes bug 12171535.

Change-Id: If982dad3c81b2b816adc5d89e7e0496923098a70

commit | commitdiff | tree

Daniel 2 Olofsson [Fri, 14 Mar 2014 22:27:52 +0000 (22:27 +0000)]

am 09421fab: Re-initialize error after attach

* commit '09421fab0784bcfc6660a09d02faea7835c28e31':
Re-initialize error after attach

commit | commitdiff | tree

Marco Nelissen [Fri, 14 Mar 2014 22:27:22 +0000 (22:27 +0000)]

Merge "Verify certificates" into klp-dev

commit | commitdiff | tree

Selim Cinek [Fri, 14 Mar 2014 22:03:09 +0000 (22:03 +0000)]

am 1470883e: am 149fd6d8: am 9c3fc0cc: am eb95e74e: DO NOT MERGE - Fixed crash for odd image width/height

* commit '1470883e0716af4e3f4014e2ef427aae67286fc8':
DO NOT MERGE - Fixed crash for odd image width/height

commit | commitdiff | tree

Craig Mautner [Fri, 14 Mar 2014 22:03:06 +0000 (22:03 +0000)]

am 5df673d9: am f6f0946a: am 00c7d34c: am ff89d589: Merge commit \'3b9de0a4\' into manualmerge

* commit '5df673d915ef9c9d4466ff1a7eeaf62f908c7aff':
Show the keyguard if unsecure window on top

commit | commitdiff | tree

Yohei Yukawa [Fri, 14 Mar 2014 22:03:03 +0000 (22:03 +0000)]

am c05362b8: am 77943308: am fd2f8d43: am 51b921d0: DO NOT MERGE - Preserve the order of InputMethodManager method calls

* commit 'c05362b84cd55f6bac20a373b74f66a79577109d':
DO NOT MERGE - Preserve the order of InputMethodManager method calls

commit | commitdiff | tree

Craig Mautner [Fri, 14 Mar 2014 22:03:00 +0000 (22:03 +0000)]

am 8a6ab821: am c6103803: am a921d8b6: am 3217cc6f: Merge "Fix activities appearing behind launcher icons" into klp-dev

* commit '8a6ab82114058eedc6aeb29902f0f3926a33a0c6':
Fix activities appearing behind launcher icons

commit | commitdiff | tree

Selim Cinek [Fri, 14 Mar 2014 21:59:42 +0000 (21:59 +0000)]

am 149fd6d8: am 9c3fc0cc: am eb95e74e: DO NOT MERGE - Fixed crash for odd image width/height

* commit '149fd6d84d53c7f509418048b931ff2c45e8deb4':
DO NOT MERGE - Fixed crash for odd image width/height

commit | commitdiff | tree

Craig Mautner [Fri, 14 Mar 2014 21:59:39 +0000 (21:59 +0000)]

am f6f0946a: am 00c7d34c: am ff89d589: Merge commit \'3b9de0a4\' into manualmerge

* commit 'f6f0946addc5230634ac2a09115097531dc6094b':
Show the keyguard if unsecure window on top

commit | commitdiff | tree

Yohei Yukawa [Fri, 14 Mar 2014 21:59:35 +0000 (21:59 +0000)]

am 77943308: am fd2f8d43: am 51b921d0: DO NOT MERGE - Preserve the order of InputMethodManager method calls

* commit '77943308f5661636d85cb5e78188dbbc8f0e329e':
DO NOT MERGE - Preserve the order of InputMethodManager method calls

commit | commitdiff | tree

Craig Mautner [Fri, 14 Mar 2014 21:59:33 +0000 (21:59 +0000)]

am c6103803: am a921d8b6: am 3217cc6f: Merge "Fix activities appearing behind launcher icons" into klp-dev

* commit 'c6103803cb24dafd2cb056dbac040a046b7ed12d':
Fix activities appearing behind launcher icons

commit | commitdiff | tree

Selim Cinek [Fri, 14 Mar 2014 21:55:05 +0000 (21:55 +0000)]

am 9c3fc0cc: am eb95e74e: DO NOT MERGE - Fixed crash for odd image width/height

* commit '9c3fc0cc6003c4f66f32d8e5f22a4f3e7d22f817':
DO NOT MERGE - Fixed crash for odd image width/height

commit | commitdiff | tree

Craig Mautner [Fri, 14 Mar 2014 21:54:52 +0000 (21:54 +0000)]

am 00c7d34c: am ff89d589: Merge commit \'3b9de0a4\' into manualmerge

* commit '00c7d34c463e9c3b4b6d5aca1e62b8caeb3fd7b2':
Show the keyguard if unsecure window on top

commit | commitdiff | tree

Yohei Yukawa [Fri, 14 Mar 2014 21:54:49 +0000 (21:54 +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

commit | commitdiff | tree

Craig Mautner [Fri, 14 Mar 2014 21:54:45 +0000 (21:54 +0000)]

am a921d8b6: am 3217cc6f: Merge "Fix activities appearing behind launcher icons" into klp-dev

* commit 'a921d8b6b1a3478f258b9999ed909907216edbae':
Fix activities appearing behind launcher icons

commit | commitdiff | tree

Mike Lockwood [Fri, 14 Mar 2014 21:50:44 +0000 (21:50 +0000)]

am 685831bf: am f9b90434: am ff64f5ed: am 381374b3: Merge "UsbDeviceManager: Fix race condition between accessory start and USB configured uevents" into klp-dev

* commit '685831bf8da4f89366ce16c1852f25efad046261':
UsbDeviceManager: Fix race condition between accessory start and USB configured uevents

commit | commitdiff | tree

Daniel 2 Olofsson [Tue, 13 Aug 2013 08:30:26 +0000 (10:30 +0200)]

Re-initialize error after attach

If flag for error after attach is not reinitialized, it may cause
NullPointerException on subsequent onAttachedWindow if error text
was reset to null.

Change-Id: I8976c28a6ca71017e5c4b3f29d4eeeb2eda48c38

commit | commitdiff | tree

Mike Lockwood [Fri, 14 Mar 2014 21:47:37 +0000 (21:47 +0000)]

am f9b90434: am ff64f5ed: am 381374b3: Merge "UsbDeviceManager: Fix race condition between accessory start and USB configured uevents" into klp-dev

* commit 'f9b90434ef04b509c7dcb868d50aa53a66b97809':
UsbDeviceManager: Fix race condition between accessory start and USB configured uevents

commit | commitdiff | tree

Mike Lockwood [Fri, 14 Mar 2014 21:42:58 +0000 (21:42 +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

commit | commitdiff | tree

Dave Allison [Fri, 14 Mar 2014 21:26:09 +0000 (21:26 +0000)]

am 4a02e071: am 788fb96d: am 47653f2d: Merge "Move options buffers to top scope"

* commit '4a02e0716d43bd2bf9b96a8b1dae181f9c35dcbf':
Move options buffers to top scope

commit | commitdiff | tree

Dave Allison [Fri, 14 Mar 2014 21:21:50 +0000 (21:21 +0000)]

am 788fb96d: am 47653f2d: Merge "Move options buffers to top scope"

* commit '788fb96d7f1cfe27cf8dd56a053258964427286f':
Move options buffers to top scope

commit | commitdiff | tree

Dave Allison [Fri, 14 Mar 2014 21:18:40 +0000 (14:18 -0700)]

am 47653f2d: Merge "Move options buffers to top scope"

* commit '47653f2d0823bcebefc23cc2441db1f8d9e55b4c':
Move options buffers to top scope

commit | commitdiff | tree

Dave Allison [Fri, 14 Mar 2014 21:15:25 +0000 (21:15 +0000)]

Merge "Move options buffers to top scope"

commit | commitdiff | tree

Dave Allison [Fri, 14 Mar 2014 15:54:33 +0000 (08:54 -0700)]

Move options buffers to top scope

It is important that the char buffers for options do
not go out of scope as the mOptions.add() does not copy
the buffer. This moves all the buffers to the top
level scope of the function to prevent accidental
overwriting when they go out of scope.

Bug: 13448497
Change-Id: I5a97ddd32ff34f237915927906e1e1f833ff036e

commit | commitdiff | tree

Selim Cinek [Fri, 14 Mar 2014 20:47:34 +0000 (20:47 +0000)]

am eb95e74e: DO NOT MERGE - Fixed crash for odd image width/height

* commit 'eb95e74e21a0e910704ca2fd67e074ab640bfba3':
DO NOT MERGE - Fixed crash for odd image width/height

commit | commitdiff | tree

Tim Kilbourn [Fri, 14 Mar 2014 20:47:03 +0000 (20:47 +0000)]

am 9873e099: am 55740325: Merge "Add leanback device features." into klp-modular-dev

* commit '9873e099c32513cdb28c3ffb8c2306ad87f0b052':
Add leanback device features.

commit | commitdiff | tree

Tim Kilbourn [Fri, 14 Mar 2014 20:44:12 +0000 (13:44 -0700)]

FEATURE_LEANBACK implies that the device is a tv.

For managing the ui mode, consider the device to be a television if it
has either the FEATURE_TELEVISION or FEATURE_LEANBACK system features.

When leanback is available for non-television devices, we need to
reconsider the use of these features for setting the television ui mode.

Change-Id: I7b82372ce19067e010be9b42111816bab186f95b

commit | commitdiff | tree

Tim Kilbourn [Fri, 14 Mar 2014 20:42:18 +0000 (20:42 +0000)]

am 55740325: Merge "Add leanback device features." into klp-modular-dev

* commit '557403250b9accf4f17ab87f636f1722949960a3':
Add leanback device features.

commit | commitdiff | tree

Tim Kilbourn [Fri, 14 Mar 2014 20:38:51 +0000 (20:38 +0000)]

Merge "Add leanback device features." into klp-modular-dev

commit | commitdiff | tree

Selim Cinek [Fri, 14 Mar 2014 17:42:48 +0000 (18:42 +0100)]

DO NOT MERGE - Fixed crash for odd image width/height

Due to an internal rounding in the renderer, the calculations
for the cropping area could be slightly offset, getting out
of the image boundaries. I sanitized the rect by ensuring they
are inside the image.

Bug: 12174629
Change-Id: Icc37790732ddd479631b898b23c05501d2dcd5be

commit | commitdiff | tree

Victoria Lease [Fri, 14 Mar 2014 17:57:32 +0000 (17:57 +0000)]

am f8ce43ea: am 1365d982: am 4cde7734: Merge "remove unnecessary switchUser call"

* commit 'f8ce43ea146cace780cb4f75348d4eca4526660a':
remove unnecessary switchUser call

commit | commitdiff | tree

Victoria Lease [Fri, 14 Mar 2014 17:54:32 +0000 (17:54 +0000)]

am 1365d982: am 4cde7734: Merge "remove unnecessary switchUser call"

* commit '1365d98270e0a0a61d10743820e923aeff974b39':
remove unnecessary switchUser call

commit | commitdiff | tree

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

commit | commitdiff | tree

Victoria Lease [Fri, 14 Mar 2014 17:48:00 +0000 (17:48 +0000)]

Merge "remove unnecessary switchUser call"

commit | commitdiff | tree

Ricardo Cervera [Fri, 14 Mar 2014 16:36:26 +0000 (16:36 +0000)]

am 7890eeff: am 882ba89b: am 50694917: am 7e566239: Merge "docs: Updated Building your First App tutorial. Bug: 13429905" into klp-docs

* commit '7890eeff3adc862160b0da257a9524c540fc1fa7':
docs: Updated Building your First App tutorial. Bug: 13429905

commit | commitdiff | tree

Joe Fernandez [Fri, 14 Mar 2014 16:36:23 +0000 (16:36 +0000)]

am 571c171e: am 58f019a6: am 8bb11153: am f7267c8b: Merge "Doc change: Update developer video on home page carousel." into klp-docs

* commit '571c171e6353cafbb98e767c2243a676c30cb8ea':
Doc change: Update developer video on home page carousel.

commit | commitdiff | tree

John Spurlock [Fri, 14 Mar 2014 16:36:20 +0000 (16:36 +0000)]

am 4108431b: am 28ac0c10: am ad66c27b: am 6d9b034c: Fix typo in public logcat page.

* commit '4108431b2e9d66c03daa204689e566b2c2598a95':
Fix typo in public logcat page.

commit | commitdiff | tree

Ricardo Cervera [Fri, 14 Mar 2014 16:36:17 +0000 (16:36 +0000)]

am c12c92bb: am 784aab78: am 8714a343: am ef6c9470: Merge "docs: Added step to get JDK to the Android Studio install instructions." into klp-docs

* commit 'c12c92bbed3631dfaf9f5975e9b69a4bda300d12':
docs: Added step to get JDK to the Android Studio install instructions.

commit | commitdiff | tree

Katie McCormick [Fri, 14 Mar 2014 16:36:14 +0000 (16:36 +0000)]

am 9c5c5a87: am 8e142bbb: am b681794d: am 07c0ad97: Merge "Doc update: new doc studio layout editor" into klp-docs

* commit '9c5c5a874a2453a9684ad56739f1a779f04e66db':
Doc update: new doc studio layout editor

commit | commitdiff | tree

John Spurlock [Fri, 14 Mar 2014 16:36:11 +0000 (16:36 +0000)]

am 399cac5b: am 75985bbe: am 62826f55: am f6228d95: Merge "Fix doc typos in AppOpsManager.java" into klp-docs

* commit '399cac5b335b7a0a0c0146c6de8b653382caae6a':
Fix doc typos in AppOpsManager.java

am 7238585e: am 4f261396: am 4ecd833e: am 7baa7c80: Merge "ConnectivityService: add support to set TCP initial rwnd" into klp-dev

* commit '7238585e2eea81d416e3e98c283e99c3a9a38a1a':
ConnectivityService: add support to set TCP initial rwnd

commit | commitdiff | tree

Chad Brubaker [Fri, 14 Mar 2014 16:36:04 +0000 (16:36 +0000)]

am 4b59883a: am 7c2b1625: am 78f204ae: am 8e240af5: Merge "Remove SO_BINDTODEVICE from VPN protect" into klp-dev

* commit '4b59883afd498dd993263c95aa6db84cbe7c49b4':
Remove SO_BINDTODEVICE from VPN protect

am 90119082: am 358eaa78: am fc1d0471: am 11b7d9fa: Merge "PrintSpooler crash if printer is reported to have only one color mode." into klp-dev

* commit '9011908230e8c91a580b3ceec2e91059460fe5fb':
PrintSpooler crash if printer is reported to have only one color mode.

commit | commitdiff | tree

Adrian Roos [Fri, 14 Mar 2014 16:35:59 +0000 (16:35 +0000)]

am d590516b: am 70a0ea0e: am 16858164: am cd0d8cb2: Merge "DO NOT MERGE - Fix keyguard pattern lockout bug" into klp-dev

* commit 'd590516b673e1a319099d8d009706d42a61877e0':
DO NOT MERGE - Fix keyguard pattern lockout bug

commit | commitdiff | tree

Baligh Uddin [Fri, 14 Mar 2014 16:35:56 +0000 (16:35 +0000)]

am 63492522: (-s ours) am 46bfaa1b: (-s ours) am a5a921e3: (-s ours) am 4545b1d2: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

* commit '634925222ad4528984bf35b9b2316db9a227d51c':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Dianne Hackborn [Fri, 14 Mar 2014 16:35:53 +0000 (16:35 +0000)]

am f29a4981: 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 'f29a4981616c05f300b582eb09d48ed81c97dd37':
Fix issue #11965706: Calls using IntentChooser are now Broken in 4.3 and 4.4

am 88768cc3: am 6adc9602: am 825dd9dd: am 73bd57f7: Merge "Retain display when creating specialized contexts. (DO NOT MERGE)" into klp-dev

* commit '88768cc35789638f16b5a1a9c9de99eb4f6cd408':
Retain display when creating specialized contexts. (DO NOT MERGE)

commit | commitdiff | tree

Ricardo Cervera [Fri, 14 Mar 2014 16:32:38 +0000 (16:32 +0000)]

am 882ba89b: am 50694917: am 7e566239: Merge "docs: Updated Building your First App tutorial. Bug: 13429905" into klp-docs

* commit '882ba89bf4aa6046b8f69460f1fe3ad87325e6d8':
docs: Updated Building your First App tutorial. Bug: 13429905

commit | commitdiff | tree

Joe Fernandez [Fri, 14 Mar 2014 16:32:36 +0000 (16:32 +0000)]

am 58f019a6: am 8bb11153: am f7267c8b: Merge "Doc change: Update developer video on home page carousel." into klp-docs

* commit '58f019a646cb3eecdd3a085eade0824c89b1f80f':
Doc change: Update developer video on home page carousel.

commit | commitdiff | tree

John Spurlock [Fri, 14 Mar 2014 16:32:33 +0000 (16:32 +0000)]

am 28ac0c10: am ad66c27b: am 6d9b034c: Fix typo in public logcat page.

* commit '28ac0c10ae58a8253db16406b63c37a2ddf94ccf':
Fix typo in public logcat page.

commit | commitdiff | tree

Ricardo Cervera [Fri, 14 Mar 2014 16:32:30 +0000 (16:32 +0000)]

am 784aab78: am 8714a343: am ef6c9470: Merge "docs: Added step to get JDK to the Android Studio install instructions." into klp-docs

* commit '784aab786c9e6f84d6ae58655f32ce6b3ccfc33f':
docs: Added step to get JDK to the Android Studio install instructions.

commit | commitdiff | tree

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

commit | commitdiff | tree

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

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

commit | commitdiff | tree

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

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.

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

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)

commit | commitdiff | tree

Ricardo Cervera [Fri, 14 Mar 2014 16:28:46 +0000 (16:28 +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

commit | commitdiff | tree

Joe Fernandez [Fri, 14 Mar 2014 16:28:30 +0000 (16:28 +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.

commit | commitdiff | tree

John Spurlock [Fri, 14 Mar 2014 16:28:26 +0000 (16:28 +0000)]

am ad66c27b: am 6d9b034c: Fix typo in public logcat page.

* commit 'ad66c27b9c2f2dce1b9443018a7c4d097bc08fc3':
Fix typo in public logcat page.

commit | commitdiff | tree

Ricardo Cervera [Fri, 14 Mar 2014 16:28:22 +0000 (16:28 +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.

commit | commitdiff | tree

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

commit | commitdiff | tree

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

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

commit | commitdiff | tree

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

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.

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

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)

am 6d3d6c4a: am 57080be9: am bdd4c31a: am 60d7c995: Merge "DO NOT MERGE setAvrcpAbsoluteVolume is passed wrong unit parameter from AudioManager" into klp-dev

* commit '6d3d6c4a06a1e83d126622d8a971f439b80ec354':
DO NOT MERGE setAvrcpAbsoluteVolume is passed wrong unit parameter from AudioManager

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

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

commit | commitdiff | tree

Narayan Kamath [Fri, 14 Mar 2014 14:25:58 +0000 (14:25 +0000)]

am 63938750: am c0232642: am 629daddd: Merge "Fix layoutlib build."

* commit '6393875024e3b2ee6916d718d79dfbeb722537c1':
Fix layoutlib build.

commit | commitdiff | tree

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.

commit | commitdiff | tree

Narayan Kamath [Fri, 14 Mar 2014 14:19:24 +0000 (07:19 -0700)]

am 629daddd: Merge "Fix layoutlib build."

* commit '629daddd03b598616de7c30a13b1f9f9b11b98fe':
Fix layoutlib build.

commit | commitdiff | tree

Narayan Kamath [Fri, 14 Mar 2014 14:12:35 +0000 (14:12 +0000)]

Merge "Fix layoutlib build."

commit | commitdiff | tree

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