120491 Commits

Author SHA1 Message Date
Brian Carlstrom
37651b6061 am 8b8c718c: Merge "Make system use patchoat to relocate during runtime."
* commit '8b8c718cbb4ac8d2e6210567d9b6097f428be222':
  Make system use patchoat to relocate during runtime.
2014-08-05 17:51:09 +00:00
Brian Carlstrom
8b8c718cbb Merge "Make system use patchoat to relocate during runtime." 2014-08-05 00:30:25 +00:00
Alex Light
1995d12d26 Make system use patchoat to relocate during runtime.
Make PackageManagerService aware of patchoat and make it use it when
appropriate.

Bug: 15358152

Change-Id: Ibe92d8b55a24bbf718b0416a21b76e5df7a2de26
2014-08-05 10:22:10 -07:00
Brian Carlstrom
5a9b135f98 am 20bac14e: Merge changes I69c064b0,I1972c5af
* commit '20bac14e521dd551addd8541380f1d9b6c910bd2':
  Move image classes options from art to AndroidRuntime [frameworks/base]
  Disable compilation based on vold.decrypt. [frameworks/base]
2014-08-04 18:32:59 +00:00
Brian Carlstrom
bccea16ec1 am 1de3c633: Merge "Move from dalvik.vm.image-dex2oat-flags to dalvik.vm.dex2oat-filter [frameworks/base]"
* commit '1de3c633dc1c355ee2356249e6309c5adf83c9a6':
  Move from dalvik.vm.image-dex2oat-flags to dalvik.vm.dex2oat-filter [frameworks/base]
2014-08-04 18:32:54 +00:00
Brian Carlstrom
20bac14e52 Merge changes I69c064b0,I1972c5af
* changes:
  Move image classes options from art to AndroidRuntime [frameworks/base]
  Disable compilation based on vold.decrypt. [frameworks/base]
2014-08-01 08:22:51 +00:00
Brian Carlstrom
1de3c633dc Merge "Move from dalvik.vm.image-dex2oat-flags to dalvik.vm.dex2oat-filter [frameworks/base]" 2014-08-01 02:02:23 +00:00
Brian Carlstrom
108166c749 Move image classes options from art to AndroidRuntime [frameworks/base]
Bug: 15165413
Change-Id: I69c064b05f62a2e8a3801dc924f5b032dedc8e51
2014-07-31 14:27:29 -07:00
Brian Carlstrom
f60d3a4702 Move from dalvik.vm.image-dex2oat-flags to dalvik.vm.dex2oat-filter [frameworks/base]
This will allow us to conditionally change the compiler-filter based on other properties.

Bug: 15165413
Change-Id: I1676987c69a3cad4217dc4b56465ef3ae886122a
2014-07-31 14:27:29 -07:00
Brian Carlstrom
4fd561637a Disable compilation based on vold.decrypt. [frameworks/base]
Bug: 15165413
Change-Id: I1972c5af5f392c2ed247888ef33c03e9ffe4d588
2014-07-31 14:27:29 -07:00
John Reck
a4c5ddf6e6 am 8c57cead: Merge "[View] Clear Hardware-Layers before system destroys HardwareRenderer​."
* commit '8c57cead83105ce273351024bfa745c979f9dc48':
  [View] Clear Hardware-Layers before system destroys HardwareRenderer​.
2014-07-31 18:32:45 +00:00
Craig Mautner
b442d922a2 am 4895bf78: Merge "Fix a bug that the RecentTask list of other’s may show up to non-primary users."
* commit '4895bf78ffd44ba076e4bc9805e43ce834f84b1e':
  Fix a bug that the RecentTask list of other’s may show up to non-primary users.
2014-07-31 16:08:50 +00:00
Narayan Kamath
39b16dd793 am bd855367: Merge "Don\'t assume languages are 2 letter codes."
* commit 'bd855367c41d588e9a3305d188707dde5b2c0a0a':
  Don't assume languages are 2 letter codes.
2014-07-31 12:16:38 +00:00
Narayan Kamath
8b2de134a6 am bb97753b: Merge "Switch TextUtils over to new ICU API."
* commit 'bb97753bc546c7725652b68e6611a75350573466':
  Switch TextUtils over to new ICU API.
2014-07-31 11:34:49 +00:00
Craig Mautner
5c4b5eded6 am 6a58309e: Merge "[ActivityManager] Prevent coredump file may not complete for testing."
* commit '6a58309e734086a21580dd8d9175ac1817ca3ab2':
  [ActivityManager] Prevent coredump file may not complete for testing.
2014-07-31 04:01:35 +00:00
Craig Mautner
f37034aca6 am 905fe15e: Merge "[ActivityManager] Avoid mistaking visibility by finishing task."
* commit '905fe15ea09238ed132ccd347e078892b6b49ddf':
  [ActivityManager] Avoid mistaking visibility by finishing task.
2014-07-31 03:57:33 +00:00
Craig Mautner
6a58309e73 Merge "[ActivityManager] Prevent coredump file may not complete for testing." 2014-07-30 19:31:16 +00:00
riddle_hsu
8062b9534f [ActivityManager] Prevent coredump file may not complete for testing.
Sympton:
During testing, skip kill native crash process manually because it will continue to die by default.

Root Cause:
Large process may take some time to do coredump.In auto test, crash process will be killed immediately that results incomplete coredump file.

Solution:
If the tester (IActivityController) will handle app crash event,
Do not kill native crashed process if the rom is debuggable.

Change-Id: Ia360af147d694125d440e5ba2f958c4759a50494
2014-07-31 03:53:04 +00:00
Craig Mautner
905fe15ea0 Merge "[ActivityManager] Avoid mistaking visibility by finishing task." 2014-07-30 19:31:16 +00:00
riddle_hsu
1df4d9f8c7 [ActivityManager] Avoid mistaking visibility by finishing task.
Sympton:
Next activity only adds to history but does not launch/resume then results ANR.

Root Cause:
In a rare timing, some windows are switched at the same time,
it will cause some finishing records on the top temporarily,
then set startIt to false that skip to resume the real top activty.

Solution:
If all activities in a task are finishing, do not use it to check.
The behavior/checking is the same concept as in JellyBean:
            // If starting in an existing task, find where that is...
            boolean startIt = true;
            for (int i = NH-1; i >= 0; i--) {
                ActivityRecord p = mHistory.get(i);
                if (p.finishing) { // <--
                    continue;
                }

Change-Id: I9d81a7b5182400c52e173da23eee61c74692beee
2014-07-31 00:26:51 +08:00
John Reck
8c57cead83 Merge "[View] Clear Hardware-Layers before system destroys HardwareRenderer​." 2014-07-29 22:52:28 +00:00
Narayan Kamath
bd855367c4 Merge "Don't assume languages are 2 letter codes." 2014-07-29 22:52:28 +00:00
Narayan Kamath
fd138cd81a Don't assume languages are 2 letter codes.
Also, note that this method never worked. Locale
settings were stored with underscores (like Locale.toString)
but matched against AssetManager.getLocales() which
returned language-tag like output.

bug: 10090157
Change-Id: I36ffea6e39ff7d1907b2787f8fd4545c24d326a8
2014-07-31 13:10:20 +01:00
Narayan Kamath
bb97753bc5 Merge "Switch TextUtils over to new ICU API." 2014-07-29 22:52:28 +00:00
Narayan Kamath
08b3516984 Switch TextUtils over to new ICU API.
.. and use Locale.getScript() instead of ICU.getScript.

bug: 15876704
Change-Id: Idf9462d8ef568dbc88c95e65a971184952e97872
2014-07-31 11:29:44 +00:00
Craig Mautner
4895bf78ff Merge "Fix a bug that the RecentTask list of other’s may show up to non-primary users." 2014-07-29 21:36:05 +00:00
Eunae Kim
26ac40305a Fix a bug that the RecentTask list of other’s may show up to non-primary users.
When switching to a newly created user, the user may face this bug when he opens the RecentTask screen.
A possible bug scenario is described as follows:
A user id of a removed user may be recycled when created a new user.
However, mRecentTasks is not correctly controlled so that old information may still remain and be possibly mapped to wrong user.
This patch prevents this bug by explicitly removing old information in mRecentTasks when removing existing user.

Change-Id: I1874dbd604598a5d740ae1e034981e21214c15c6
Signed-off-by: Eunae Kim <eunae.kim@lge.com>
2014-07-31 13:58:53 +09:00
henry.uh_chen
a199720190 [View] Clear Hardware-Layers before system destroys HardwareRenderer​.
Symptom: Sometimes HardwareLayer display is corrupted.

Root Cause: In some cases, ViewRootImpl destroys HardwareRenderer​ without
clearing HardwareLayers in the view hirarchy. If the system trims memory fully
and kill the glContext at the same time, HardwareLayer may corrupt.

Solution: Clear Hardware-Layers before system destroys HardwareRenderer​.

Reproduce steps: Modify the cache's trim memory mechanism to make it easier to
trim fully, HardwareLayers implemented in app will easily be corrupted.
Modification of the cache is not required but make it easier to reproduce.

Change-Id: If57c802cdacf8dc37cbbcc199e74f9482834f981
2014-07-25 18:07:24 +08:00
Tim Murray
638a2b2dac am 8224edb9: Merge "Update makefile for clang host build."
* commit '8224edb94f6421a2d910362c56940dcf991847e6':
  Update makefile for clang host build.
2014-07-24 21:04:20 +00:00
Tim Murray
8224edb94f Merge "Update makefile for clang host build." 2014-07-23 18:45:08 +00:00
Chris Craik
88fbb5f48f am 215ecb93: Merge "Restore untrusted glStencilMask value on resume after functor"
* commit '215ecb93e9ca93a7445f38534b29ac917557f8e1':
  Restore untrusted glStencilMask value on resume after functor
2014-07-23 00:20:16 +00:00
Chris Craik
215ecb93e9 Merge "Restore untrusted glStencilMask value on resume after functor" 2014-07-22 20:34:45 +00:00
Chris Craik
c47aba2a77 Restore untrusted glStencilMask value on resume after functor
Fixes an issue where the stencil buffer is corrupted
(used in overdraw debugging, path clipping) when used in
conjunction with a HW accelerated WebView.

bug:15023700
bug:16465551

Change-Id: If201b503931380f7107a34e9a9a2f877a50f72b1
2014-07-22 23:19:02 +00:00
Chris Craik
8040d6fccb am bfb349e2: Merge "[Bitmap] Add null pointer protection in Bitmap_sameAs()"
* commit 'bfb349e2421d5b74701818f6aa486f057b2e5884':
  [Bitmap] Add null pointer protection in Bitmap_sameAs()
2014-07-22 19:15:15 +00:00
Chris Craik
48242d801c am 50a2d633: Merge "[HWUI] Fix invisible views are still shown in popup window"
* commit '50a2d6339c7a6ee121c4aa52afc4cc027913f3fc':
  [HWUI] Fix invisible views are still shown in popup window
2014-07-22 19:11:18 +00:00
Chris Craik
bfb349e242 Merge "[Bitmap] Add null pointer protection in Bitmap_sameAs()" 2014-07-22 16:35:00 +00:00
Chris Craik
50a2d6339c Merge "[HWUI] Fix invisible views are still shown in popup window" 2014-07-22 16:35:00 +00:00
Neil Fuller
1a4290473d am fc6346d4: Merge "Rewriting android.text.format.Time without the native _tz functions"
* commit 'fc6346d461c9ed9b499643db830885241cc82838':
  Rewriting android.text.format.Time without the native _tz functions
2014-07-22 15:29:08 +00:00
Narayan Kamath
b5c714fca7 am e242111c: Merge "Remove copy of Locale.adjustLanguageCode."
* commit 'e242111c5dc63e1cbba41d2341b493cb9c064589':
  Remove copy of Locale.adjustLanguageCode.
2014-07-22 13:30:41 +00:00
Craig Mautner
b7bb95b0f3 am 02fd104f: Merge "Skip broadcasting to a receiver if the receiver seems to be dead"
* commit '02fd104f303cb7d55d6af42be8fe7be543e9aba5':
  Skip broadcasting to a receiver if the receiver seems to be dead
2014-07-21 15:31:38 +00:00
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
Tim Murray
132ed0f2b4 Update makefile for clang host build.
bug 16172793

Change-Id: If7484c5dbcccce7d925bec97bff0a3e4c30e9434
2014-07-17 16:37:42 -07:00
Craig Mautner
02fd104f30 Merge "Skip broadcasting to a receiver if the receiver seems to be dead" 2014-07-17 23:22:21 +00:00
Koji Fukui
63909886b2 Skip broadcasting to a receiver if the receiver seems to be dead
If an application that has a broadcast receiver is killed
during broadcasting, thread variable of ProcessRecord becomes null
so that IIntentReceiver#performReceive() is called
in BroadcastQueue#performReceiveLocked(). But if binder driver has not
noticed the death of the application yet, it can't throw
DeadObjectException. After that, binder driver notices. But it can't
notify DeadObjectException to the caller because performReceive() is
async call. So broadcasting keeps on waiting for finishing
performReceive() until timeout.

This change checks the death of the application before calling
performReceive() and skips broadcasting to the receiver
if the application has already died.

Change-Id: Ifa02b8b1a7e7b6fd314de90fedff5b7a5326825d
2014-07-21 09:53:05 +02:00
Yohann Roussel
3bdbf644d6 Merge "Add support.multidex tests app for an update bug." 2014-07-17 22:37:43 +00:00
Neil Fuller
fc6346d461 Merge "Rewriting android.text.format.Time without the native _tz functions" 2014-07-17 22:36:58 +00:00
Neil Fuller
d7f0849b8c Rewriting android.text.format.Time without the native _tz functions
Bug: 15765976
Change-Id: I666b72ecf9da8a9dcfb97cc503006b415909a558
2014-07-22 15:06:16 +01:00
Narayan Kamath
e242111c5d Merge "Remove copy of Locale.adjustLanguageCode." 2014-07-17 22:36:58 +00:00
Narayan Kamath
1d31a5f824 Remove copy of Locale.adjustLanguageCode.
Change-Id: Iba8c67890f95d50fadcd1245dc083d646fe6bcc1
2014-07-18 16:09:36 +01: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