OSDN Git Service

android-x86/frameworks-base.git
10 years agoCamera2: Update exposureTimeRange related docs
Zhijun He [Tue, 18 Mar 2014 23:21:45 +0000 (16:21 -0700)]
Camera2: Update exposureTimeRange related docs

Bug: 13250951
Change-Id: I8a77feb1b9877c75fd5a41a324fe17605ed338e0

10 years agoMerge "Import translations. DO NOT MERGE"
Geoff Mendal [Mon, 17 Mar 2014 17:10:24 +0000 (17:10 +0000)]
Merge "Import translations. DO NOT MERGE"

10 years agoImport translations. DO NOT MERGE
Geoff Mendal [Mon, 17 Mar 2014 17:08:44 +0000 (10:08 -0700)]
Import translations. DO NOT MERGE

Change-Id: I0099deb9f73a8d3c6ea1ff8a8aa8808d7f1c322e
Auto-generated-cl: translation import

10 years agoMerge "Import translations. DO NOT MERGE"
Geoff Mendal [Mon, 17 Mar 2014 16:34:26 +0000 (16:34 +0000)]
Merge "Import translations. DO NOT MERGE"

10 years agoMerge "Import translations. DO NOT MERGE"
Geoff Mendal [Mon, 17 Mar 2014 16:34:07 +0000 (16:34 +0000)]
Merge "Import translations. DO NOT MERGE"

10 years agoImport translations. DO NOT MERGE
Geoff Mendal [Mon, 17 Mar 2014 16:29:38 +0000 (09:29 -0700)]
Import translations. DO NOT MERGE

Change-Id: Ifbc42b448dd9a92fce471716061797ba608cfd76
Auto-generated-cl: translation import

10 years agoImport translations. DO NOT MERGE
Geoff Mendal [Mon, 17 Mar 2014 16:27:08 +0000 (09:27 -0700)]
Import translations. DO NOT MERGE

Change-Id: I997192f031eea02fbad2f41370db984dce84b65c
Auto-generated-cl: translation import

10 years agoam 8cee1fdc: (-s ours) am f096ed68: am 2fd045c0: DO NOT MERGE - merge nativeDecodeFil...
Leon Scroggins III [Mon, 17 Mar 2014 16:02:29 +0000 (16:02 +0000)]
am 8cee1fdc: (-s ours) am f096ed68: am 2fd045c0: DO NOT MERGE - merge nativeDecodeFileDescriptor fixes into KLP-MR2 BUG:13191516

* commit '8cee1fdc2542e5146c9b3d375819e87daeb4d1aa':
  DO NOT MERGE - merge nativeDecodeFileDescriptor fixes into KLP-MR2 BUG:13191516

10 years agoam 7e6fe28b: (-s ours) am 96978ee2: am f8d8777d: Update framework to use M33 Skia...
Leon Scroggins III [Mon, 17 Mar 2014 16:02:26 +0000 (16:02 +0000)]
am 7e6fe28b: (-s ours) am 96978ee2: am f8d8777d: Update framework to use M33 Skia. DO NOT MERGE

* commit '7e6fe28b12bf936cc8c5c5f689a6aef6b7f21625':
  Update framework to use M33 Skia. DO NOT MERGE

10 years agoam f096ed68: am 2fd045c0: DO NOT MERGE - merge nativeDecodeFileDescriptor fixes into...
Leon Scroggins III [Mon, 17 Mar 2014 15:58:36 +0000 (15:58 +0000)]
am f096ed68: am 2fd045c0: DO NOT MERGE - merge nativeDecodeFileDescriptor fixes into KLP-MR2 BUG:13191516

* commit 'f096ed68e1ee5810f436ca820c1eada4b1a182a5':
  DO NOT MERGE - merge nativeDecodeFileDescriptor fixes into KLP-MR2 BUG:13191516

10 years agoam 96978ee2: am f8d8777d: Update framework to use M33 Skia. DO NOT MERGE
Leon Scroggins III [Mon, 17 Mar 2014 15:58:32 +0000 (15:58 +0000)]
am 96978ee2: am f8d8777d: Update framework to use M33 Skia. DO NOT MERGE

* commit '96978ee290ea0ef666c49ffa8733a8c74304c9f1':
  Update framework to use M33 Skia. DO NOT MERGE

10 years agoam 2fd045c0: DO NOT MERGE - merge nativeDecodeFileDescriptor fixes into KLP-MR2 BUG...
Leon Scroggins III [Mon, 17 Mar 2014 15:55:46 +0000 (15:55 +0000)]
am 2fd045c0: DO NOT MERGE - merge nativeDecodeFileDescriptor fixes into KLP-MR2 BUG:13191516

* commit '2fd045c092b08772be81a6d58bbb95e5e608403f':
  DO NOT MERGE - merge nativeDecodeFileDescriptor fixes into KLP-MR2 BUG:13191516

10 years agoam f8d8777d: Update framework to use M33 Skia. DO NOT MERGE
Leon Scroggins III [Mon, 17 Mar 2014 15:55:43 +0000 (15:55 +0000)]
am f8d8777d: Update framework to use M33 Skia. DO NOT MERGE

* commit 'f8d8777dddf91c741981b4f795f2fb2b1d81c1b6':
  Update framework to use M33 Skia. DO NOT MERGE

10 years agoDO NOT MERGE - merge nativeDecodeFileDescriptor fixes into KLP-MR2
Leon Scroggins III [Tue, 14 Jan 2014 20:14:57 +0000 (15:14 -0500)]
DO NOT MERGE - merge nativeDecodeFileDescriptor fixes into KLP-MR2
BUG:13191516

Original CLs below:

In nativeDecodeFileDescriptor, use fdopen.

Instead of attempting to mmap the entire file, create an
SkFILEStream from a FILE.

BUG:11669944
BUG:11028218
Cherry-pick from: If67da91484acc79f9f3dde6d05201409c0c75e41

-------------------------------------------------------------------------

Decode file descriptor from the correct offset.

Fix a few bugs in nativeDecodeFileDescriptor:
1. Restore the FD's offset when exiting the function.
2. Copy the data when potentially using an SkImageRef.
   The old behavior would have continued to modify the
   file descriptor's offset each time a new decode was
   required. The copy ensures that the file descriptor
   remains unchanged.
3. Buffer the file stream.
   Prior to this change, if the image was not a PNG,
   the stream would be rewound to the beginning of the
   file, even if the file descriptor was passed in with
   an offset. Thanks to the buffer, the stream is only
   rewound to the original offset.

Depends on https://googleplex-android-review.googlesource.com/#/c/415821/1
in external/skia

BUG:12807677
BUG:12895876
Cherry-pick from: I38b8cf5d210dbbc0107e6562e3884867de57fc4b

10 years agoUpdate framework to use M33 Skia. DO NOT MERGE
Leon Scroggins III [Tue, 3 Dec 2013 21:26:51 +0000 (16:26 -0500)]
Update framework to use M33 Skia. DO NOT MERGE

(These CLs are already in master.)

Bug: 13246311

This cherry-picks 7 CLs:

-----------------------------------------------------------------------

Remove calls to deprecated SkBitmap::setIsOpaque()

setIsOpaque() has been removed from ToT Skia.

Update setters for mIsPremultiplied and hasAlpha to take the
other into consideration.

cherry-pick from: I1b36b0b0ce7126031eb7b769b563c17dcd4b306a

-----------------------------------------------------------------------

Merge AssetStream with AssetStreamAdaptor.

Add enums to the constructor for AssetStreamAdaptor to choose the
different behaviors used by the (former) two different classes.

The old clients of AssetStream now get the following features of
AssetStreamAdaptor
- Debugging statements on error.
- The stream is an SkStreamRewindable.
- getLength() returns the correct value, and the old way of getting
  the length (read(NULL, 0)) is no longer implemented, since it is
  no longer used.
- isAtEnd() returns the correct value. ToT Skia makes it pure virtual,
  so some implementation is necessary.

cherry-pick from: I2a5395914e4f53830aaefee396556459083a1c56

-----------------------------------------------------------------------

Deprecate Android-specific SkPaint functions.

The following functions were problematic:
 const SkGlyph& getUnicharMetrics(SkUnichar, const SkMatrix*);
 const SkGlyph& getGlyphMetrics(uint16_t, const SkMatrix*);
 const void* findImage(const SkGlyph&, const SkMatrix*);

Replacing them with calls through SkGlyphCache solved a nasty crash
bug, so they have all been deprecated.

Bug: 11968757
cherry-pick from: Id746315d41aec5b211b78b172a883c2061130f08

-----------------------------------------------------------------------

pass SkGlyphCache into updateGlyphCache()

Doing so prevents us from double-locking the glyph cache, thereby
effectively locking ourselves out of reusing work that we'd just done.

Bug: 11968757
cherry-pick from: I5c552f2d0bbe30af2ce9054ba684e7da756a0d89

-----------------------------------------------------------------------

Updates to the Skia API needed to merge the WebView m33 version of Skia.

cherry-pick from: I0f63b53f2aae58871413b132742fc84138f069a3

Bugfix for screenshots (recent apps) due to incorrect rowBytes computation

bug: 12915192
cherry-pick from: I4d5fe2a2f75baf66099e0970fb646686a1992714

-----------------------------------------------------------------------

Fix bug in AndroidPixelRef where we did not store the correct imageInfo for a recycled bitmap.

cherry-pick from: I882483b78886e2f19fa4e43a86e69f5a82b3b7e5

-----------------------------------------------------------------------

Change-Id: Ie2b731a9f0795802418cfecddb4b684c92c64d33

Conflicts:
core/jni/android/graphics/Bitmap.cpp
core/jni/android/graphics/Graphics.cpp
core/jni/android/graphics/Typeface.cpp
graphics/java/android/graphics/Bitmap.java

10 years agoMerge "Fixing crash when ActivityManager does not have a proper thumbnail"
Winson Chung [Mon, 17 Mar 2014 01:54:25 +0000 (01:54 +0000)]
Merge "Fixing crash when ActivityManager does not have a proper thumbnail"

10 years agoMerge "Simplifying memory management, use Task Keys as resource cache keys."
Winson Chung [Mon, 17 Mar 2014 01:54:04 +0000 (01:54 +0000)]
Merge "Simplifying memory management, use Task Keys as resource cache keys."

10 years agoam 9e6bad83: am adb3a198: am 05d855de: am d93e7b24: Merge "Don\'t attempt to launch...
Steve Moyer [Sun, 16 Mar 2014 17:37:55 +0000 (17:37 +0000)]
am 9e6bad83: am adb3a198: am 05d855de: am d93e7b24: Merge "Don\'t attempt to launch disabled activities in smoke test."

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

10 years agoam adb3a198: am 05d855de: am d93e7b24: Merge "Don\'t attempt to launch disabled activ...
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.

10 years agoam 05d855de: am d93e7b24: Merge "Don\'t attempt to launch disabled activities in...
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.

10 years agoam d93e7b24: Merge "Don\'t attempt to launch disabled activities in smoke test."
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.

10 years agoMerge "Don't attempt to launch disabled activities in smoke test."
Steve Moyer [Sun, 16 Mar 2014 17:26:43 +0000 (17:26 +0000)]
Merge "Don't attempt to launch disabled activities in smoke test."

10 years agoMerge "EthernetDataTracker: Update hardware address when interface is changed"
Jaewan Kim [Sun, 16 Mar 2014 10:23:34 +0000 (10:23 +0000)]
Merge "EthernetDataTracker: Update hardware address when interface is changed"

10 years agoMerge "Revert "Rename DisplayList->RenderNode""
John Reck [Sat, 15 Mar 2014 02:15:33 +0000 (02:15 +0000)]
Merge "Revert "Rename DisplayList->RenderNode""

10 years agoRevert "Rename DisplayList->RenderNode"
John Reck [Sat, 15 Mar 2014 02:14:53 +0000 (02:14 +0000)]
Revert "Rename DisplayList->RenderNode"

Missed some test(s), reverting to fix build

This reverts commit ef09d8cf946443e7f4ac4541f843368ac4338c59.

Change-Id: Ifee6c694e5f4b962d03dee200ccbf8dc9662e666

10 years agoFixing crash when ActivityManager does not have a proper thumbnail
Winson Chung [Sat, 15 Mar 2014 00:52:47 +0000 (17:52 -0700)]
Fixing crash when ActivityManager does not have a proper thumbnail

- Fixing issue with hw layers ref count not properly being incremented and decremented
- Preventing message handler from keeping a strong ref to the RecentsService

10 years agoam 821df858: am 5b98618f: am ca0aba39: Merge commit \'54d5702c\' into manualmerge
Craig Mautner [Sat, 15 Mar 2014 00:30:58 +0000 (00:30 +0000)]
am 821df858: am 5b98618f: am ca0aba39: Merge commit \'54d5702c\' into manualmerge

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

10 years agoMerge "Rename DisplayList->RenderNode"
John Reck [Sat, 15 Mar 2014 00:25:33 +0000 (00:25 +0000)]
Merge "Rename DisplayList->RenderNode"

10 years agoam c2b8df82: am 42dd0bb6: am 9539b4a0: Merge "FEATURE_LEANBACK implies that the devic...
Tim Kilbourn [Sat, 15 Mar 2014 00:24:44 +0000 (00:24 +0000)]
am c2b8df82: am 42dd0bb6: am 9539b4a0: Merge "FEATURE_LEANBACK implies that the device is a tv." into klp-modular-dev

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

10 years agoam 77a00cfe: (-s ours) am 30260c7e: am 203a6ddb: am 105c4792: am 10a07a04: Merge...
Marco Nelissen [Sat, 15 Mar 2014 00:24:40 +0000 (00:24 +0000)]
am 77a00cfe: (-s ours) am 30260c7e: am 203a6ddb: am 105c4792: am 10a07a04: Merge "Verify certificates" into klp-dev

* commit '77a00cfe4b29f180b6f5ed65eddc96422453e191':
  Verify certificates

10 years agoam f1b1855a: am 18306520: am 39fc43b0: am 4111e7e1: am 09421fab: Re-initialize error...
Daniel 2 Olofsson [Sat, 15 Mar 2014 00:18:09 +0000 (00:18 +0000)]
am f1b1855a: am 18306520: am 39fc43b0: am 4111e7e1: am 09421fab: Re-initialize error after attach

* commit 'f1b1855acc623f6137f1d51810948a8149b2a9e8':
  Re-initialize error after attach

10 years agoMerge "hal3: Add availableHotPixelModes, update modes."
Ruben Brunk [Sat, 15 Mar 2014 00:14:56 +0000 (00:14 +0000)]
Merge "hal3: Add availableHotPixelModes, update modes."

10 years agoRename DisplayList->RenderNode
John Reck [Fri, 14 Mar 2014 23:24:57 +0000 (16:24 -0700)]
Rename DisplayList->RenderNode

Change-Id: I1628b6e802252c001ca09ba762f52453b68f4cad

10 years agoam 5b98618f: am ca0aba39: Merge commit \'54d5702c\' into manualmerge
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.

10 years agoam ca0aba39: Merge commit \'54d5702c\' into manualmerge
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.

10 years agoSimplifying memory management, use Task Keys as resource cache keys.
Winson Chung [Fri, 14 Mar 2014 21:06:29 +0000 (14:06 -0700)]
Simplifying memory management, use Task Keys as resource cache keys.

- Attempts to load non-topmost task thumbnails from cache
- Ensuring that we release all references to the activity from the bg loader
- Removes background loading debug flag
- Moving callbacks into their respective classes
- cleaning up some callbacks when data is loaded in the bg

Change-Id: Ibb968349d08084922d5b28e432b76a165bf20d6b

10 years agoMerge commit '54d5702c' into manualmerge
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

10 years agoam 42dd0bb6: am 9539b4a0: Merge "FEATURE_LEANBACK implies that the device is a tv...
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.

10 years agoam 30260c7e: am 203a6ddb: am 105c4792: am 10a07a04: Merge "Verify certificates" into...
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

10 years agoam 18306520: am 39fc43b0: am 4111e7e1: am 09421fab: Re-initialize error after attach
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

10 years agoam 93d279f5: (-s ours) am 1470883e: am 149fd6d8: am 9c3fc0cc: am eb95e74e: DO NOT...
Selim Cinek [Fri, 14 Mar 2014 23:33:15 +0000 (23:33 +0000)]
am 93d279f5: (-s ours) am 1470883e: am 149fd6d8: am 9c3fc0cc: am eb95e74e: DO NOT MERGE - Fixed crash for odd image width/height

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

10 years agoam 9539b4a0: Merge "FEATURE_LEANBACK implies that the device is a tv." into klp-modul...
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.

10 years agoam 203a6ddb: am 105c4792: am 10a07a04: Merge "Verify certificates" into klp-dev
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

10 years agoam 39fc43b0: am 4111e7e1: am 09421fab: Re-initialize error after attach
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

10 years agoMerge commit '17586ce7' into manualmerge
Craig Mautner [Fri, 14 Mar 2014 23:31:07 +0000 (16:31 -0700)]
Merge commit '17586ce7' into manualmerge

Conflicts:
policy/src/com/android/internal/policy/impl/PhoneWindowManager.java

Change-Id: I4dedf1dc80e224c47cbc020836ad408b641c1d76

10 years agoMerge "Show the keyguard if unsecure window on top"
Craig Mautner [Fri, 14 Mar 2014 23:24:54 +0000 (23:24 +0000)]
Merge "Show the keyguard if unsecure window on top"

10 years agoShow the keyguard if unsecure window on top
Craig Mautner [Mon, 3 Mar 2014 21:26:03 +0000 (13:26 -0800)]
Show the keyguard if unsecure window on top

When traversing windows save the fact that windows above the topmost
fullscreen window do not hide the lockscreen. If there is such a
window don't show it.

(cherry picked from commit ab55e524b89c13082193940a5bf8480a2c2522d9)

Fixes bug 13225149.

Change-Id: Ib6f33cbcfb2f60d8957a9184729ecdec80c6a236

10 years agoMerge "FEATURE_LEANBACK implies that the device is a tv." into klp-modular-dev
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

10 years agoam 105c4792: am 10a07a04: Merge "Verify certificates" into klp-dev
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

10 years agoam 4111e7e1: am 09421fab: Re-initialize error after attach
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

10 years agoam 477897ad: Merge "Fix incorrect setting of TaskRecord.frontOfTask. DO NOT MERGE...
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.

10 years agoam 10a07a04: Merge "Verify certificates" into klp-dev
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

10 years agoMerge "Fix incorrect setting of TaskRecord.frontOfTask. DO NOT MERGE." into klp-dev
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

10 years agoFix incorrect setting of TaskRecord.frontOfTask. DO NOT MERGE.
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

10 years agoam 09421fab: Re-initialize error after attach
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

10 years agoMerge "Verify certificates" into klp-dev
Marco Nelissen [Fri, 14 Mar 2014 22:27:22 +0000 (22:27 +0000)]
Merge "Verify certificates" into klp-dev

10 years agoam 43bfed54: (-s ours) am c05362b8: am 77943308: am fd2f8d43: am 51b921d0: DO NOT...
Yohei Yukawa [Fri, 14 Mar 2014 22:23:05 +0000 (22:23 +0000)]
am 43bfed54: (-s ours) am c05362b8: am 77943308: am fd2f8d43: am 51b921d0: DO NOT MERGE - Preserve the order of InputMethodManager method calls

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

10 years agoam ce805c7c: am 8a6ab821: am c6103803: am a921d8b6: am 3217cc6f: Merge "Fix activitie...
Craig Mautner [Fri, 14 Mar 2014 22:23:02 +0000 (22:23 +0000)]
am ce805c7c: am 8a6ab821: am c6103803: am a921d8b6: am 3217cc6f: Merge "Fix activities appearing behind launcher icons" into klp-dev

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

10 years agoam 1470883e: am 149fd6d8: am 9c3fc0cc: am eb95e74e: DO NOT MERGE - Fixed crash for...
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

10 years agoam 5df673d9: am f6f0946a: am 00c7d34c: am ff89d589: Merge commit \'3b9de0a4\' into...
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

10 years agoam c05362b8: am 77943308: am fd2f8d43: am 51b921d0: DO NOT MERGE - Preserve the order...
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

10 years agoam 8a6ab821: am c6103803: am a921d8b6: am 3217cc6f: Merge "Fix activities appearing...
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

10 years agoam 149fd6d8: am 9c3fc0cc: am eb95e74e: DO NOT MERGE - Fixed crash for odd image width...
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

10 years agoam f6f0946a: am 00c7d34c: am ff89d589: Merge commit \'3b9de0a4\' into manualmerge
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

10 years agoam 77943308: am fd2f8d43: am 51b921d0: DO NOT MERGE - Preserve the order of InputMeth...
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

10 years agoam c6103803: am a921d8b6: am 3217cc6f: Merge "Fix activities appearing behind launche...
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

10 years agoam 9c3fc0cc: am eb95e74e: DO NOT MERGE - Fixed crash for odd image width/height
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

10 years agoam 00c7d34c: am ff89d589: Merge commit \'3b9de0a4\' into manualmerge
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

10 years agoam fd2f8d43: am 51b921d0: DO NOT MERGE - Preserve the order of InputMethodManager...
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

10 years agoam a921d8b6: am 3217cc6f: Merge "Fix activities appearing behind launcher icons"...
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

10 years agoam c5353ce3: am 685831bf: am f9b90434: am ff64f5ed: am 381374b3: Merge "UsbDeviceMana...
Mike Lockwood [Fri, 14 Mar 2014 21:54:13 +0000 (21:54 +0000)]
am c5353ce3: am 685831bf: am f9b90434: am ff64f5ed: am 381374b3: Merge "UsbDeviceManager: Fix race condition between accessory start and USB configured uevents" into klp-dev

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

10 years agoam 685831bf: am f9b90434: am ff64f5ed: am 381374b3: Merge "UsbDeviceManager: Fix...
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

10 years agoRe-initialize error after attach
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

10 years agoam f9b90434: am ff64f5ed: am 381374b3: Merge "UsbDeviceManager: Fix race condition...
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

10 years agoMerge "Launch new tasks with Doc Centric flag."
Craig Mautner [Fri, 14 Mar 2014 21:43:28 +0000 (21:43 +0000)]
Merge "Launch new tasks with Doc Centric flag."

10 years agoam ff64f5ed: am 381374b3: Merge "UsbDeviceManager: Fix race condition between accesso...
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

10 years agoLaunch new tasks with Doc Centric flag.
Craig Mautner [Wed, 12 Mar 2014 21:17:26 +0000 (14:17 -0700)]
Launch new tasks with Doc Centric flag.

Introduction of new Intent flag FLAG_ACTIVITY_NEW_DOCUMENT. When
this flag is set the target activity will be launched in its own
task. This is the start of the new Doc Centric mode of working.

Change-Id: I719168532134ab2c5ea3300df676c2b2a0e81795

10 years agoam 273fe6a3: am 4a02e071: am 788fb96d: am 47653f2d: Merge "Move options buffers to...
Dave Allison [Fri, 14 Mar 2014 21:35:51 +0000 (21:35 +0000)]
am 273fe6a3: am 4a02e071: am 788fb96d: am 47653f2d: Merge "Move options buffers to top scope"

* commit '273fe6a327de8051ac075855ceb7b33a9422c7a7':
  Move options buffers to top scope

10 years agoam 4a02e071: am 788fb96d: am 47653f2d: Merge "Move options buffers to top scope"
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

10 years agoam 788fb96d: am 47653f2d: Merge "Move options buffers to top scope"
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

10 years agoam 47653f2d: Merge "Move options buffers to top scope"
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

10 years agoMerge "Add native method delegates to layoutlib"
Deepanshu Gupta [Fri, 14 Mar 2014 21:16:22 +0000 (21:16 +0000)]
Merge "Add native method delegates to layoutlib"

10 years agoMerge "Move options buffers to top scope"
Dave Allison [Fri, 14 Mar 2014 21:15:25 +0000 (21:15 +0000)]
Merge "Move options buffers to top scope"

10 years agoMove options buffers to top scope
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

10 years agoam ec033943: am 9873e099: am 55740325: Merge "Add leanback device features." into...
Tim Kilbourn [Fri, 14 Mar 2014 20:50:40 +0000 (20:50 +0000)]
am ec033943: am 9873e099: am 55740325: Merge "Add leanback device features." into klp-modular-dev

* commit 'ec0339437869ebb42a67a2811dc6de31239d5d62':
  Add leanback device features.

10 years agoam eb95e74e: DO NOT MERGE - Fixed crash for odd image width/height
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

10 years agoam 9873e099: am 55740325: Merge "Add leanback device features." into klp-modular-dev
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.

10 years agoFEATURE_LEANBACK implies that the device is a tv.
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

10 years agoam 55740325: Merge "Add leanback device features." into klp-modular-dev
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.

10 years agoMerge "Add leanback device features." into klp-modular-dev
Tim Kilbourn [Fri, 14 Mar 2014 20:38:51 +0000 (20:38 +0000)]
Merge "Add leanback device features." into klp-modular-dev

10 years agohal3: Add availableHotPixelModes, update modes.
Ruben Brunk [Tue, 4 Mar 2014 22:11:52 +0000 (14:11 -0800)]
hal3: Add availableHotPixelModes, update modes.

Bug: 12957573
Change-Id: I2fd6ef60bf98c53288c2bc343d82a06602474916

10 years agoMerge "Fixing memory leaks related to Tasks holding onto their callbacks."
Winson Chung [Fri, 14 Mar 2014 20:34:27 +0000 (20:34 +0000)]
Merge "Fixing memory leaks related to Tasks holding onto their callbacks."

10 years agoAdd native method delegates to layoutlib
Deepanshu Gupta [Fri, 14 Mar 2014 20:24:56 +0000 (13:24 -0700)]
Add native method delegates to layoutlib

Add delegates for Path.native_isConvex and ICU.getCurrencyNumericCode.
The original methods were added in
5be83edd15e11420287cc0af93a95d5a6dfae68f and
d627bd4525e41b0503f94c2887c3e01618c73105 respectively.

TODO: Implement Path_Delegate.native_isConvex

Change-Id: If1046467d3950ab6955c6b81383a60fd6bd03fd2

10 years agoDO NOT MERGE - Fixed crash for odd image width/height
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

10 years agoMerge "Make RegisteredServicesCache understand ASEC-based updates"
Christopher Tate [Fri, 14 Mar 2014 19:16:07 +0000 (19:16 +0000)]
Merge "Make RegisteredServicesCache understand ASEC-based updates"

10 years agoam c2d934d7: am f8ce43ea: am 1365d982: am 4cde7734: Merge "remove unnecessary switchU...
Victoria Lease [Fri, 14 Mar 2014 18:01:38 +0000 (18:01 +0000)]
am c2d934d7: am f8ce43ea: am 1365d982: am 4cde7734: Merge "remove unnecessary switchUser call"

* commit 'c2d934d7e87b9eb8cbb15ccc0c39b13ad32de460':
  remove unnecessary switchUser call

10 years agoam f8ce43ea: am 1365d982: am 4cde7734: Merge "remove unnecessary switchUser call"
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

10 years agoam 1365d982: am 4cde7734: Merge "remove unnecessary switchUser call"
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

10 years agoam d387206a: am 7890eeff: am 882ba89b: am 50694917: am 7e566239: Merge "docs: Updated...
Ricardo Cervera [Fri, 14 Mar 2014 17:54:11 +0000 (17:54 +0000)]
am d387206a: am 7890eeff: am 882ba89b: am 50694917: am 7e566239: Merge "docs: Updated Building your First App tutorial. Bug: 13429905" into klp-docs

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

10 years agoam 53edba8d: am 571c171e: am 58f019a6: am 8bb11153: am f7267c8b: Merge "Doc change...
Joe Fernandez [Fri, 14 Mar 2014 17:54:07 +0000 (17:54 +0000)]
am 53edba8d: am 571c171e: am 58f019a6: am 8bb11153: am f7267c8b: Merge "Doc change: Update developer video on home page carousel." into klp-docs

* commit '53edba8d5cae3ea385f64ee980399278bb5a76fd':
  Doc change: Update developer video on home page carousel.