120518 Commits

Author SHA1 Message Date
Jeff Sharkey
840e932584 am 2013cb1f: Merge "Prevent system_server shutdown when trying to format external storage"
* commit '2013cb1f917b3d29df9a6f0caf34e17632bd240f':
  Prevent system_server shutdown when trying to format external storage
2014-08-12 22:17:56 +00:00
Craig Mautner
1a7e5ad0e7 am 67fe6d1f: Merge "Revert "Fix a bug: unable to start activity when AM is killing the process.""
* commit '67fe6d1f76a740147cc9c85487e8e70b53c744f8':
  Revert "Fix a bug: unable to start activity when AM is killing the process."
2014-08-12 21:13:05 +00:00
Jeff Sharkey
2013cb1f91 Merge "Prevent system_server shutdown when trying to format external storage" 2014-08-12 20:07:20 +00:00
Craig Mautner
67fe6d1f76 Merge "Revert "Fix a bug: unable to start activity when AM is killing the process."" 2014-08-12 19:23:43 +00:00
Craig Mautner
ca9ba58786 Revert "Fix a bug: unable to start activity when AM is killing the process."
This reverts commit 5073145f85c8197ec4387d5e2599442a7291ca9c.

I spoke to Dianne and she said that if this is making a problem go away then it is only hiding it and there is a deeper problem we need to fix.

I think if killedByApp is true then we should set app and app.thread to null. I'll look at it further when I have more time.

Change-Id: I44c29e15ca654666440472eab2d2af1c5af80b9a
2014-08-12 21:09:07 +00:00
Craig Mautner
379135d3d0 am dc0afc91: Merge "Fix a bug: unable to start activity when AM is killing the process."
* commit 'dc0afc91c24c217705d6d430aa7fabbd22b6d2b3':
  Fix a bug: unable to start activity when AM is killing the process.
2014-08-12 17:05:11 +00:00
Leo Hsu
5073145f85 Fix a bug: unable to start activity when AM is killing the process.
Symptom: No activity was started for startActivity, low repro rate.
Root Cause: Starting activity on a process which was killed by ActivityManagerService.killUnneededProcessLocked() and before receiving AppDeathRecipient of it.
Solution: Choose the flow of starting a new process if ProcessRecord.killedByAm is true.

Change-Id: Ida2639b0fb4631222fc92d65aadc9fd2da637b45
2014-08-12 13:47:23 +08:00
Craig Mautner
dc0afc91c2 Merge "Fix a bug: unable to start activity when AM is killing the process." 2014-08-11 18:15:12 +00:00
Adam Powell
8432e77baa am dafcc610: Merge "Don\'t unnecessarily set LayoutParams on children"
* commit 'dafcc61078cca409abd77516ce7ccee1eb60db2a':
  Don't unnecessarily set LayoutParams on children
2014-08-11 17:52:03 +00:00
Piotr Jastrzebski
388aedee04 am 07291ccc: Merge "Remove memory leak."
* commit '07291cccc0348b5783659909a38e7fbd207f9605':
  Remove memory leak.
2014-08-11 09:59:24 +00:00
Adam Powell
dafcc61078 Merge "Don't unnecessarily set LayoutParams on children" 2014-08-08 20:41:34 +00:00
Calin Juravle
e998bb1736 am 94f3e47d: Merge "Fix the instruction set for dex file during (re)moving ops."
* commit '94f3e47da5acc48b1003b64acdc539cdf6cbe30c':
  Fix the instruction set for dex file during (re)moving ops.
2014-08-08 17:53:50 +00:00
Calin Juravle
6db95fc339 am 3d274434: Merge "Pass the name of the native bridge library to the runtime"
* commit '3d274434c78856388484a722da2887ca846907ee':
  Pass the name of the native bridge library to the runtime
2014-08-08 17:53:46 +00:00
Piotr Jastrzebski
07291cccc0 Merge "Remove memory leak." 2014-08-07 18:51:06 +00:00
Piotr Jastrzebski
1a68b079d7 Remove memory leak.
Call EndIteration in endIteration to free memory allocated for cookie in
StartIteration.

Change-Id: I3d58a461c2f3676565cfd7922dc6d8d5c35feae9
2014-08-11 08:20:35 +01:00
Calin Juravle
3d274434c7 Merge "Pass the name of the native bridge library to the runtime" 2014-08-07 18:51:06 +00:00
Calin Juravle
2f4cf2cfd1 Pass the name of the native bridge library to the runtime
Bug: 16843953
Change-Id: Ia0f57a9b3e30a74fe4e93eb4453f841c1ef512eb
2014-08-08 18:45:19 +01:00
Calin Juravle
94f3e47da5 Merge "Fix the instruction set for dex file during (re)moving ops." 2014-08-07 18:42:30 +00:00
Calin Juravle
219b535673 Fix the instruction set for dex file during (re)moving ops.
This complements https://android-review.googlesource.com/#/c/103231/
where the instruction set was mapped just for comptilation. The same
should have been done for move,remove and getSize.

The list of dex code ISAs is alo de-duped.

Bug: 16185267
Change-Id: I8fe453a800812e382e8f41b5f7922997aa9c18a9
2014-08-08 18:45:28 +01:00
Calin Juravle
29965e18ee am 7f935726: Merge "Use native ISA for dex code (in case there\'s a NativeBridge)"
* commit '7f93572650d939a416588a17baab87906d310c40':
  Use native ISA for dex code (in case there's a NativeBridge)
2014-08-07 12:50:12 +00:00
Calin Juravle
7f93572650 Merge "Use native ISA for dex code (in case there's a NativeBridge)" 2014-08-07 09:28:10 +00:00
Mathieu Chartier
021cf13e7a am 7782c6b3: Merge "Fix JNI error in exception reporting."
* commit '7782c6b381ce862cd4e4f7c986e1b7a0bb7ddaa9':
  Fix JNI error in exception reporting.
2014-08-06 21:04:44 +00:00
Calin Juravle
576c384ed8 Use native ISA for dex code (in case there's a NativeBridge)
In the presence of a native bridge it is more efficient to compile the
dex directly to the native ISA than to use the shared library ISA as a
reference.

This can be achieve by configuring the readonly system properties to map
between the .so ISA and the desired dex code .ISA (e.g.
ro.dalvik.vm.isa.ISA1=ISA2).

Bug: 16185267

Change-Id: I50baa7b37e1465b9adf72d6f6b96f526a08d59c7
2014-08-06 19:28:28 +01:00
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
Mathieu Chartier
7782c6b381 Merge "Fix JNI error in exception reporting." 2014-08-05 00:20:48 +00:00
Mathieu Chartier
cf6775eece Fix JNI error in exception reporting.
There was a JNI error where when you got an OOM and called
report_exception, it would call two NewStringUTF in a row without
checking the return values. This could mean that the first one
threw a new OOME and the second one would cause a JNI error when
it also attempted to throw an OOME with a pending OOME.

Bug: 16843627
Change-Id: Ie4f9f9a5f8b7993cd3655d42a6718c0a5e1199f8
2014-08-06 13:41:19 -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