drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
119,422 Commits 1 Branch 0 Tags
Commit Graph

119422 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Narayan Kamath
ddcaf0d178 am d2133079: am 7c0dfed5: Merge "Pass int32_t for JNI calls to java Input/Output streams." 
* commit 'd2133079c085cb0879facc8ee72678524d22571a':
  Pass int32_t for JNI calls to java Input/Output streams.
 2014-03-18 09:41:20 +00:00
Narayan Kamath
d2133079c0 am 7c0dfed5: Merge "Pass int32_t for JNI calls to java Input/Output streams." 
* commit '7c0dfed535bd23ce7cce0f8c498a8d6d3f14ff0f':
  Pass int32_t for JNI calls to java Input/Output streams.
 2014-03-18 02:38:24 -07:00
Narayan Kamath
7c0dfed535 Merge "Pass int32_t for JNI calls to java Input/Output streams." 2014-03-18 09:34:43 +00:00
Ricardo Cervera
08795b7744 am f7c3ecc1: am 71a47aa7: Merge "docs: Added release notes for SDK 22.6.1" into klp-docs 
* commit 'f7c3ecc1e14ebe3666822ad23f9da340f731d1b9':
  docs: Added release notes for SDK 22.6.1
 2014-03-17 22:14:33 +00:00
Ricardo Cervera
f7c3ecc1e1 am 71a47aa7: Merge "docs: Added release notes for SDK 22.6.1" into klp-docs 
* commit '71a47aa7f0ea18bc4d10d87a1932c9f19554fb15':
  docs: Added release notes for SDK 22.6.1
 2014-03-17 22:11:12 +00:00
Ricardo Cervera
71a47aa7f0 Merge "docs: Added release notes for SDK 22.6.1" into klp-docs 2014-03-17 22:07:18 +00:00
Ricardo Cervera
e2a40c42be docs: Added release notes for SDK 22.6.1 
Added release notes for SDK 22.6.1.

stage: http://quixote.mtv:8001/tools/sdk/eclipse-adt.html

Patch: Addressed Joe's comments.
Patch: Addressed Joe's comments.
Patch: Addressed Joe's comments.
Patch: Added new release notes info from Raphael.
Patch: Addressed Joe's comments.
Patch: Addressed Joe's comments.

Change-Id: I229c6b366c19d1d119ccd180ead04f7dd044de4e
 2014-03-17 14:42:20 -07:00
Geoff Mendal
8e5359e56e am c3281db2: (-s ours) am 65325236: (-s ours) Import translations. DO NOT MERGE 
* commit 'c3281db2fb874f56d5612b9d3f07bd91067755ac':
  Import translations. DO NOT MERGE
 2014-03-17 16:50:42 +00:00
Geoff Mendal
c3281db2fb am 65325236: (-s ours) Import translations. DO NOT MERGE 
* commit '6532523652cf16d3e498939965defab4bd22c491':
  Import translations. DO NOT MERGE
 2014-03-17 16:46:53 +00:00
Jeff Sharkey
275d14befc am eeb36c5c: am d88d8174: Merge "Null pointer exception in FileRotator.java" 
* commit 'eeb36c5cfc107fe9128490e9e127c2bca2d24e28':
  Null pointer exception in FileRotator.java
 2014-03-17 16:39:06 +00:00
Jeff Sharkey
eeb36c5cfc am d88d8174: Merge "Null pointer exception in FileRotator.java" 
* commit 'd88d817498327462f42e50348239eac59147f310':
  Null pointer exception in FileRotator.java
 2014-03-17 09:36:03 -07:00
Geoff Mendal
6532523652 Import translations. DO NOT MERGE 
Change-Id: I0b2d6484e67628d26f34d3be39b8b11f009151bd
Auto-generated-cl: translation import
 2014-03-17 09:34:19 -07:00
Jeff Sharkey
d88d817498 Merge "Null pointer exception in FileRotator.java" 2014-03-17 16:32:05 +00:00
Ashok Bhat
2bb39d7a43 Pass int32_t for JNI calls to java Input/Output streams. 
Passing size_t is problematic on 64 bit platforms where
it's 8 bytes in size. Conversion to int32_t is safe because
the size argument is always clamped to fCapacity, which is
4 bytes wide.

Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
Change-Id: I58558561a4f56451485f1a5fc6cdeda677247071
 2014-03-17 10:13:16 +00:00
Steve Moyer
0f4a5b9af9 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.
 2014-03-16 17:31:32 +00:00
Steve Moyer
05d855defe 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.
 2014-03-16 10:29:25 -07:00
Steve Moyer
d93e7b2424 Merge "Don't attempt to launch disabled activities in smoke test." 2014-03-16 17:26:43 +00:00
Craig Mautner
65b30b22e3 am 54d5702c: am 477897ad: Merge "Fix incorrect setting of TaskRecord.frontOfTask. DO NOT MERGE." into klp-dev 
* commit '54d5702cf8e5e7d9fe5794f93b90b6f678ac27bb':
  Fix incorrect setting of TaskRecord.frontOfTask.  DO NOT MERGE.
 2014-03-14 23:32:48 +00:00
Craig Mautner
54d5702cf8 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.
 2014-03-14 22:36:15 +00:00
Marco Nelissen
b80adb5dbd am 105c4792: am 10a07a04: Merge "Verify certificates" into klp-dev 
* commit '105c47924f7af9319ec9242b952b4bf074585229':
  Verify certificates
 2014-03-14 22:34:54 +00:00
Marco Nelissen
105c47924f am 10a07a04: Merge "Verify certificates" into klp-dev 
* commit '10a07a043f7fa47148ae2cc2fcd6b0edeb52190b':
  Verify certificates
 2014-03-14 22:32:02 +00:00
Daniel 2 Olofsson
20bba89c2c am 4111e7e1: am 09421fab: Re-initialize error after attach 
* commit '4111e7e17665b1142853c71e9fd1cf6af5f68b82':
  Re-initialize error after attach
 2014-03-14 22:30:49 +00:00
Craig Mautner
477897ad7b Merge "Fix incorrect setting of TaskRecord.frontOfTask. DO NOT MERGE." into klp-dev 2014-03-14 22:30:04 +00:00
Craig Mautner
fdf28cc4be 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
 2014-03-14 22:28:07 +00:00
Daniel 2 Olofsson
4111e7e176 am 09421fab: Re-initialize error after attach 
* commit '09421fab0784bcfc6660a09d02faea7835c28e31':
  Re-initialize error after attach
 2014-03-14 22:27:52 +00:00
Marco Nelissen
10a07a043f Merge "Verify certificates" into klp-dev 2014-03-14 22:27:23 +00:00
Daniel 2 Olofsson
09421fab07 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
 2014-03-14 14:49:23 -07:00
Dave Allison
0d70d336b4 am 788fb96d: am 47653f2d: Merge "Move options buffers to top scope" 
* commit '788fb96d7f1cfe27cf8dd56a053258964427286f':
  Move options buffers to top scope
 2014-03-14 21:21:59 +00:00
Dave Allison
788fb96d7f am 47653f2d: Merge "Move options buffers to top scope" 
* commit '47653f2d0823bcebefc23cc2441db1f8d9e55b4c':
  Move options buffers to top scope
 2014-03-14 14:18:40 -07:00
Dave Allison
47653f2d08 Merge "Move options buffers to top scope" 2014-03-14 21:15:25 +00:00
Dave Allison
07a1e2323b 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
 2014-03-14 21:15:08 +00:00
Selim Cinek
47a023085b 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
 2014-03-14 20:51:43 +00:00
Selim Cinek
9c3fc0cc60 am eb95e74e: DO NOT MERGE - Fixed crash for odd image width/height 
* commit 'eb95e74e21a0e910704ca2fd67e074ab640bfba3':
  DO NOT MERGE - Fixed crash for odd image width/height
 2014-03-14 20:47:34 +00:00
Selim Cinek
eb95e74e21 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
 2014-03-14 20:11:17 +00:00
Craig Mautner
713cd791a9 am 00c7d34c: am ff89d589: Merge commit \'3b9de0a4\' into manualmerge 
* commit '00c7d34c463e9c3b4b6d5aca1e62b8caeb3fd7b2':
  Show the keyguard if unsecure window on top
 2014-03-14 19:00:20 +00:00
Yohei Yukawa
daf27b85f1 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
 2014-03-14 19:00:17 +00:00
Craig Mautner
e04170029d am a921d8b6: am 3217cc6f: Merge "Fix activities appearing behind launcher icons" into klp-dev 
* commit 'a921d8b6b1a3478f258b9999ed909907216edbae':
  Fix activities appearing behind launcher icons
 2014-03-14 19:00:07 +00:00
Mike Lockwood
80f9355201 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
 2014-03-14 18:48:13 +00:00
Victoria Lease
2ecd61cd87 am 1365d982: am 4cde7734: Merge "remove unnecessary switchUser call" 
* commit '1365d98270e0a0a61d10743820e923aeff974b39':
  remove unnecessary switchUser call
 2014-03-14 17:54:45 +00:00
Victoria Lease
1365d98270 am 4cde7734: Merge "remove unnecessary switchUser call" 
* commit '4cde773435074809672f9de6a47b26de902a83d1':
  remove unnecessary switchUser call
 2014-03-14 10:51:45 -07:00
Victoria Lease
4cde773435 Merge "remove unnecessary switchUser call" 2014-03-14 17:48:01 +00:00
Narayan Kamath
bd5e61fdee am c0232642: am 629daddd: Merge "Fix layoutlib build." 
* commit 'c0232642b74517aa2717673f0811ba65c620f491':
  Fix layoutlib build.
 2014-03-14 14:22:40 +00:00
Narayan Kamath
c0232642b7 am 629daddd: Merge "Fix layoutlib build." 
* commit '629daddd03b598616de7c30a13b1f9f9b11b98fe':
  Fix layoutlib build.
 2014-03-14 07:19:24 -07:00
Narayan Kamath
629daddd03 Merge "Fix layoutlib build." 2014-03-14 14:12:35 +00:00
Narayan Kamath
c73991bda0 Fix layoutlib build. 
Was using private data structures from libcore.

Change-Id: I5bd43190081891659e18b5c871686e6078efcc81
 2014-03-14 14:10:30 +00:00
Craig Mautner
00c7d34c46 am ff89d589: Merge commit \'3b9de0a4\' into manualmerge 
* commit 'ff89d589c7eb32265bf70068ffaef24104a580a5':
  Show the keyguard if unsecure window on top
 2014-03-14 08:47:54 +00:00
Ricardo Cervera
6a02c9d892 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
 2014-03-14 04:17:42 +00:00
Joe Fernandez
da3556584f 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.
 2014-03-14 04:13:49 +00:00
John Spurlock
6d03139938 am ad66c27b: am 6d9b034c: Fix typo in public logcat page. 
* commit 'ad66c27b9c2f2dce1b9443018a7c4d097bc08fc3':
  Fix typo in public logcat page.
 2014-03-14 04:13:30 +00:00
Ricardo Cervera
937503abc7 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.
 2014-03-14 04:13:12 +00:00