Commit Graph

120442 Commits

Author SHA1 Message Date
Yohann Roussel
9cfbca64ac am 3bdbf644: Merge "Add support.multidex tests app for an update bug."
* commit '3bdbf644d61f46b531838558fabbd5b990fc4913':
  Add support.multidex tests app for an update bug.
2014-07-18 10:59:05 +00:00
Yohann Roussel
3bdbf644d6 Merge "Add support.multidex tests app for an update bug." 2014-07-17 22:37:43 +00:00
Chris Craik
8470bb0ac9 am 152d9e61: Merge "[HWUI]: fix residual line on FrameBuffer"
* commit '152d9e61284d31e3b9dfa8dccca3c3c78382035d':
  [HWUI]: fix residual line on FrameBuffer
2014-07-17 19:32:08 +00:00
Chris Craik
152d9e6128 Merge "[HWUI]: fix residual line on FrameBuffer" 2014-07-17 18:05:27 +00:00
Craig Mautner
15c2da7ce5 am 2e7b2521: Merge "[ActivityManager]: Update home process when home activity resumed"
* commit '2e7b2521f1758bf16935a9a879c595cc44eab37f':
  [ActivityManager]: Update home process when home activity resumed
2014-07-16 17:21:21 +00:00
Craig Mautner
2e7b2521f1 Merge "[ActivityManager]: Update home process when home activity resumed" 2014-07-16 16:25:15 +00:00
louis_chang
73fd117c65 [ActivityManager]: Update home process when home activity resumed
Symptom:
  When switch between two home activities, the home process might not be updated to the correct one. In that case, the home activity might be killed easily.

Root Cause:
  The home process is updated only when a home activity is newly created or being restarted. ActivityManager did not update the home process when simply resume a home activity.

Solution:
  Update home process when home activity resumed

Reproduce Steps:
  1. Install a launcher application, such as Apex Launcher
  2. Press home key to change to Apex Launcher by "Just once" option
  3. Press home key to switch back to original home activity by "Just once" option.
     (The home process is still the Apex Launcher's process because ActivityManager does not update the home process when resuming the original home activity.)

Change-Id: I046279ca7ba851a283ee67ea19202890f7b3f343
2014-07-16 17:16:34 +00:00
Craig Mautner
07c3b19556 am d543c3e1: Merge "[ActivityManager] Do not finish root activity when reset task"
* commit 'd543c3e113ffa82a63669feca540ca2e10b1576f':
  [ActivityManager] Do not finish root activity when reset task
2014-07-16 15:50:43 +00:00
Craig Mautner
3eb3b1d66a am 7f4b4202: Merge "[ActivityManager] Move top task to top in window manager"
* commit '7f4b4202130620edf385b7544e1358c589ee69d2':
  [ActivityManager] Move top task to top in window manager
2014-07-16 15:46:49 +00:00
Narayan Kamath
eab505fa8d am f9c79c63: Merge "Removed useless test"
* commit 'f9c79c63bc6630888785b7acdd8332b08e87a18b':
  Removed useless test
2014-07-16 13:35:52 +00:00
Narayan Kamath
73083ed1e4 am 3c8f8caa: Merge "Add an internal API to get all asset locales."
* commit '3c8f8caaa711c0d025dab85cfdacc7586e75d31a':
  Add an internal API to get all asset locales.
2014-07-16 12:57:02 +00:00
Yohann Roussel
2f00e62d96 Add support.multidex tests app for an update bug.
The failing scenario is
- install v1
- run
- update to v2
- update to v3
- run
last run was failing with initial multidex library versions because
it's still running on v1 extracted secondary dex files.

(cherry picked from commit 05e2a94c8b)

Change-Id: Ibb5d16642b127ee4c0baddc4f6ba461c11d25f90
2014-07-16 12:54:56 +02:00
Narayan Kamath
f9c79c63bc Merge "Removed useless test" 2014-07-16 01:09:23 +00:00
Narayan Kamath
3c8f8caaa7 Merge "Add an internal API to get all asset locales." 2014-07-16 01:07:54 +00:00
Craig Mautner
d543c3e113 Merge "[ActivityManager] Do not finish root activity when reset task" 2014-07-15 20:36:09 +00:00
louis_chang
f87b219539 [ActivityManager] Do not finish root activity when reset task
Symptom:
The root activity not always located at index 0 of the task.
For example, the index 1 activity will become the new root
when the original root activity (at index 0) finished.
The new root activity might be finished unexpectedly before
the original root activity actually destroyed.

Solution:
Check frontOfTask to avoid finishing the root activity unexpectedly

Change-Id: I623ab97e9c95c83b3cfe7c9dfc151a291a391ea4
2014-07-16 18:15:35 +08:00
Craig Mautner
7f4b420213 Merge "[ActivityManager] Move top task to top in window manager" 2014-07-15 20:36:09 +00:00
louis_chang
d937616f87 [ActivityManager] Move top task to top in window manager
Symptom:
In certain situations, application starts activity while
it is in background. When an existing background activity
starts a new activity which results to be kept in the same
background task, the new activity won't be resumed.
In that case, the background task (sourceTask) should not be
moved to top in window manager.

Solution:
Move top task of the target stack to top in window manager

Change-Id: Id7a37ea67ce1f80e0c2b5399865c51fd7113deb8
2014-07-16 17:42:04 +08:00
Deepanshu Gupta
39488dc3d4 am 7b97e426: Merge "Optimize Blend composites."
* commit '7b97e426bd77b22a64b49112ce2455a51bac0b5b':
  Optimize Blend composites.
2014-07-15 20:10:40 +00:00
Deepanshu Gupta
aaef3efa22 am e147445a: Merge "Add BlendComposite.java"
* commit 'e147445a5e10b3e0fd01c7792e560ad677cd77ab':
  Add BlendComposite.java
2014-07-15 20:10:36 +00:00
Deepanshu Gupta
7b97e426bd Merge "Optimize Blend composites." 2014-07-14 23:57:35 +00:00
Deepanshu Gupta
e147445a5e Merge "Add BlendComposite.java" 2014-07-14 23:57:35 +00:00
Narayan Kamath
9e6d9d4c81 Add an internal API to get all asset locales.
This will allow us to not copy paste this code verbatim into
bundled apps.

bug: 10090157
Change-Id: I008dc683ecbef2ad8b7a26968cb3cbda7e5a8388
2014-07-14 16:29:22 +01:00
Narayan Kamath
f7d6925ee7 am 7850f95d: Merge "Allow 3 letter language codes in InputMethodUtils."
* commit '7850f95dc55c4e4801cf145c42a1bc98b49a87d6':
  Allow 3 letter language codes in InputMethodUtils.
2014-07-14 08:52:55 +00:00
Christopher Tate
f908b61abf am ef3b35b4: Merge "Logging in LocalTransport on as default"
* commit 'ef3b35b48c31919a7d6977e41db7f9d37654dec3':
  Logging in LocalTransport on as default
2014-07-11 01:44:36 +00:00
Colin Cross
d01adef1ba am 1f060a17: Merge "GpsLocationProvider: look for config file in /etc/gps.<ro.hardware.gps>.conf"
* commit '1f060a178d9e69f8c08ccad5d7e0ef8fb22ddf8e':
  GpsLocationProvider: look for config file in /etc/gps.<ro.hardware.gps>.conf
2014-07-11 01:44:31 +00:00
Narayan Kamath
7850f95dc5 Merge "Allow 3 letter language codes in InputMethodUtils." 2014-07-10 20:18:52 +00:00
Narayan Kamath
7be75338a3 Allow 3 letter language codes in InputMethodUtils.
Replace locale.substring(0, 2) with a function that always
returns the first component of the locale (assumed to be the
language).

bug: 10090157

(cherry picked from commit cefc79c6b18bb2e824c299e7b9e212071e5ebc43)

Change-Id: I56b02dd0c6dc222daa3ceade841a30879449bb4a
2014-07-14 09:42:55 +01:00
Christopher Tate
ef3b35b48c Merge "Logging in LocalTransport on as default" 2014-07-10 17:35:34 +00:00
Henrik Baard
2db2b9aa36 Logging in LocalTransport on as default
The logging is LocalTransport.java is enabled by
default.

Change default to false to remove logs, as this class
states that it is only for debug.

Change-Id: Iae63c7b62edbd503c606f0aee671a9579e78843d
2014-07-10 08:46:39 +02:00
Colin Cross
1f060a178d Merge "GpsLocationProvider: look for config file in /etc/gps.<ro.hardware.gps>.conf" 2014-07-10 00:35:03 +00:00
Stephen Hines
8348c35165 am 4fea742c: Merge "Update copyFrom(BaseObj[]) for large objects."
* commit '4fea742c07d2d55f29b7d61078914c5f83817313':
  Update copyFrom(BaseObj[]) for large objects.
2014-07-10 00:16:44 +00:00
Elliott Hughes
3964ea4675 am d74f99d3: Merge "Switch frameworks/base/libs/androidfw to the new icu."
* commit 'd74f99d390d9a0e1c800ee68b1bc39c210aca989':
  Switch frameworks/base/libs/androidfw to the new icu.
2014-07-10 00:08:33 +00:00
Elliott Hughes
f072fda13f am effcc83e: Merge "Switch frameworks/base/core/jni to the new icu."
* commit 'effcc83e42638a5fa7eceaebe22081a1b9eaebaf':
  Switch frameworks/base/core/jni to the new icu.
2014-07-10 00:08:29 +00:00
Elliott Hughes
effcc83e42 Merge "Switch frameworks/base/core/jni to the new icu." 2014-07-09 22:27:32 +00:00
Elliott Hughes
92b1896dfd Switch frameworks/base/core/jni to the new icu.
Change-Id: Id12ce02da377ce78f318e10633c47f500237d9d9
2014-07-09 16:56:11 -07:00
Robin Lee
1f0180bfa8 am 74803e55: Merge "Make misc config directory during user creation"
* commit '74803e559caffe235b86dc52cf76ef98343c0d74':
  Make misc config directory during user creation
2014-07-09 17:39:13 +00:00
Stephen Hines
4fea742c07 Merge "Update copyFrom(BaseObj[]) for large objects." 2014-07-09 14:45:53 +00:00
Tim Murray
31e12acca5 Update copyFrom(BaseObj[]) for large objects.
Change-Id: I99cadbd1ad925cad0dd357c9abbd1a49c07785c9
2014-07-09 17:09:33 -07:00
Elliott Hughes
d74f99d390 Merge "Switch frameworks/base/libs/androidfw to the new icu." 2014-07-09 14:45:53 +00:00
Elliott Hughes
6a4deeda70 Switch frameworks/base/libs/androidfw to the new icu.
Change-Id: Id82830750dd7e83bbc66811a1133b403cc697c97
2014-07-09 16:58:28 -07:00
Brian Carlstrom
5aba0149b9 am b85afb38: Merge "Make dex2oat heap size product configurable [frameworks/base]"
* commit 'b85afb38e88ceca61af2855e30d34bc6ec4d32d9':
  Make dex2oat heap size product configurable [frameworks/base]
2014-07-09 12:21:54 +00:00
Brian Carlstrom
b85afb38e8 Merge "Make dex2oat heap size product configurable [frameworks/base]" 2014-07-08 22:56:31 +00:00
Brian Carlstrom
6d77eb99bf Make dex2oat heap size product configurable [frameworks/base]
Bug: 15919420
Change-Id: I9b7b4f60826fc9b0cc6bb3765ceaa36542425006
2014-07-08 15:05:41 -07:00
Stephen Hines
957ec05ef6 am 70a3c558: Merge "Adds support for multi-input kernels to Frameworks/Base/RS."
* commit '70a3c558645f8e693ce37577fdd61b8d1fd4ed9a':
  Adds support for multi-input kernels to Frameworks/Base/RS.
2014-07-08 21:25:19 +00:00
Robert Greenwalt
a7efe9b874 am 912700fc: Merge "Add Telefonica/Movistar specific APN details for dun"
* commit '912700fca8e02fe93fca7d95ef22472f77349ffe':
  Add Telefonica/Movistar specific APN details for dun
2014-07-08 16:59:17 +00:00
Deepanshu Gupta
9ce0746104 Optimize Blend composites.
Removed redundant array allocations to improve performance for various
blending modes.

Change-Id: Iaba1d6ff3ad03eebdc859c599b610cc593370438
2014-07-07 15:16:36 -07:00
Craig Mautner
6d6d218962 am 08881385: Merge "[ActivityManager] Prevent potential deadlock from system error dialog and InputMethodManager."
* commit '08881385a86bf887669a555ae03759c374ec9c50':
  [ActivityManager] Prevent potential deadlock from system error dialog and InputMethodManager.
2014-07-07 21:19:45 +00:00
Brian Carlstrom
044492e1b7 am 52a154fe: Merge "Remove"
* commit '52a154febb7c06b142116235c368417dd5e542ba':
  Remove
2014-07-07 20:55:16 +00:00
Robert Greenwalt
912700fca8 Merge "Add Telefonica/Movistar specific APN details for dun" 2014-07-07 19:33:32 +00:00