OSDN Git Service
Svetoslav [Wed, 21 Jan 2015 18:39:34 +0000 (18:39 +0000)]
AlertActivity now behaves as a dialog for accessibility purposes. automerge:
76ff4dd
automerge:
03944ce
* commit '
03944ce664c733d1922247229fc56f6630c0a5e4':
AlertActivity now behaves as a dialog for accessibility purposes.
Svetoslav [Wed, 21 Jan 2015 18:31:46 +0000 (18:31 +0000)]
AlertActivity now behaves as a dialog for accessibility purposes.
automerge:
76ff4dd
* commit '
76ff4dd0de8d9747b9341f064dd270c5762705c6':
AlertActivity now behaves as a dialog for accessibility purposes.
Svetoslav [Fri, 16 Jan 2015 23:42:58 +0000 (15:42 -0800)]
AlertActivity now behaves as a dialog for accessibility purposes.
AlertActivity is intended to look like a dialog but for accessibility
purposes it was populated as an activity. As a result the content of
the "dialog" was not properly announced to the user.
bug:
18865632
Change-Id: I27166fc74678981f4f3ad71d6d25727b5110340c
Craig Mautner [Wed, 21 Jan 2015 17:09:30 +0000 (17:09 +0000)]
Merge "[ActivityManager] No home activity resumed and cause key dispatch ANR" automerge:
247e828
automerge:
ad55787
* commit '
ad55787db2f9e4b56a8406026566564d6aa08d5a':
[ActivityManager] No home activity resumed and cause key dispatch ANR
Craig Mautner [Wed, 21 Jan 2015 17:04:26 +0000 (17:04 +0000)]
Merge "[ActivityManager] No home activity resumed and cause key dispatch ANR"
automerge:
247e828
* commit '
247e828b5cd63efeae3226c2a9d3bd1f466141dc':
[ActivityManager] No home activity resumed and cause key dispatch ANR
Craig Mautner [Wed, 21 Jan 2015 17:01:01 +0000 (17:01 +0000)]
Merge "[ActivityManager] No home activity resumed and cause key dispatch ANR"
Geoff Mendal [Wed, 21 Jan 2015 16:35:14 +0000 (16:35 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
automerge:
bae67d3 -s ours
* commit '
bae67d30304853ce3898b922ab0753718c89f82c':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 21 Jan 2015 16:32:07 +0000 (16:32 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
Kenny Guy [Wed, 21 Jan 2015 16:24:01 +0000 (16:24 +0000)]
Merge "Only hide cross profile disclosure when showing resolver." into lmp-mr1-dev automerge:
06ab0ca
automerge:
11c4cc1
* commit '
11c4cc196de9dca3bfad711b1b9e4b779a72cc01':
Only hide cross profile disclosure when showing resolver.
Kenny Guy [Wed, 21 Jan 2015 16:17:03 +0000 (16:17 +0000)]
Merge "Only hide cross profile disclosure when showing resolver." into lmp-mr1-dev
automerge:
06ab0ca
* commit '
06ab0ca4812450ec297722957e18b34cbfa733b2':
Only hide cross profile disclosure when showing resolver.
Geoff Mendal [Wed, 21 Jan 2015 16:14:22 +0000 (08:14 -0800)]
Import translations. DO NOT MERGE
Change-Id: Icfb7c61dc2e280254ec926c2b706ba2d7dd1273a
Auto-generated-cl: translation import
Kenny Guy [Wed, 21 Jan 2015 16:13:21 +0000 (16:13 +0000)]
Merge "Only hide cross profile disclosure when showing resolver." into lmp-mr1-dev
Geoff Mendal [Wed, 21 Jan 2015 14:26:54 +0000 (14:26 +0000)]
Import translations. DO NOT MERGE automerge:
af69fcd -s ours
automerge:
45c5f9d -s ours
* commit '
45c5f9d195a4522fdf13915052fe509bbfd80688':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 21 Jan 2015 14:19:37 +0000 (14:19 +0000)]
Import translations. DO NOT MERGE
automerge:
af69fcd -s ours
* commit '
af69fcd0bd4878145214dc16adbf5ef614e7f3a4':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 21 Jan 2015 14:15:11 +0000 (08:15 -0600)]
Import translations. DO NOT MERGE
Change-Id: I3d03c8e758bc8ecfe8e8b789fcfeab386e7eec9a
Auto-generated-cl: translation import
Narayan Kamath [Wed, 21 Jan 2015 14:09:33 +0000 (14:09 +0000)]
Merge "Choose the right executable for wrapped applications." automerge:
aa87e89
automerge:
4af0265
* commit '
4af0265a35bcd8a0a7513dd85fe371597e2038c5':
Choose the right executable for wrapped applications.
Narayan Kamath [Wed, 21 Jan 2015 14:05:29 +0000 (14:05 +0000)]
Merge "Choose the right executable for wrapped applications."
automerge:
aa87e89
* commit '
aa87e89e81b547cc28e09a5f71adb288ee18b32a':
Choose the right executable for wrapped applications.
Narayan Kamath [Wed, 21 Jan 2015 14:01:55 +0000 (14:01 +0000)]
Merge "Choose the right executable for wrapped applications."
louis_chang [Wed, 21 Jan 2015 11:01:52 +0000 (19:01 +0800)]
[ActivityManager] No home activity resumed and cause
key dispatch ANR
Symptom:
In some scenario, there might have two home tasks
in the home stack. If the top home task was finishing
and expected to return to home stack, no activity
will resume.
Root Cause:
Unable to perform resumeHomeStackTask() because the
resumeTopActivityLocked() has been prevented to invoke
recursively.
Solution:
Just resume the next activity if already in home stack
Change-Id: I24ecbcac6cee4ddbd90cdd27c4f4915cffb9b354
Jinsuk Kim [Wed, 21 Jan 2015 02:33:08 +0000 (02:33 +0000)]
am
f23829d6: Merge "CEC: Switch active input after routing control" into lmp-mr1-dev
automerge:
f8d2f32
* commit '
f8d2f3284f9613bc20967e19213573804ea0ab83':
CEC: Switch active input after routing control
Jinsuk Kim [Wed, 21 Jan 2015 02:16:37 +0000 (02:16 +0000)]
am
f23829d6: Merge "CEC: Switch active input after routing control" into lmp-mr1-dev
* commit '
f23829d64ff6fdae6f8b1d2b0fbe3f2715b313d4':
CEC: Switch active input after routing control
Jinsuk Kim [Wed, 21 Jan 2015 02:10:53 +0000 (02:10 +0000)]
Merge "CEC: Switch active input after routing control" into lmp-mr1-dev
Dianne Hackborn [Wed, 21 Jan 2015 00:43:50 +0000 (00:43 +0000)]
Merge "Fix issue #
19020826: Including timing issues in ANR reason breaks clustering" into lmp-mr1-dev automerge:
66f8d9b
automerge:
8781dbf
* commit '
8781dbf3dfa79c39fc0410521dff04156fae876a':
Fix issue #
19020826: Including timing issues in ANR reason breaks clustering
Jinsuk Kim [Wed, 21 Jan 2015 00:32:30 +0000 (09:32 +0900)]
CEC: Switch active input after routing control
Makes sure the previous HDMI input gets switched to upon receiving
<Inactive Source> from the current active source device.
Bug:
18986597
Change-Id: I7120e81d75b5fd4cafd4b483e9b232b96e50f597
Dianne Hackborn [Wed, 21 Jan 2015 00:27:47 +0000 (00:27 +0000)]
Merge "Fix issue #
19020826: Including timing issues in ANR reason breaks clustering" into lmp-mr1-dev
automerge:
66f8d9b
* commit '
66f8d9bb693d5e410ac6f6ba3029cf6c7dc2f104':
Fix issue #
19020826: Including timing issues in ANR reason breaks clustering
Dianne Hackborn [Wed, 21 Jan 2015 00:23:52 +0000 (00:23 +0000)]
Merge "Fix issue #
19020826: Including timing issues in ANR reason breaks clustering" into lmp-mr1-dev
Geoff Mendal [Tue, 20 Jan 2015 23:58:17 +0000 (23:58 +0000)]
Merge branch 'lmp-mr1-dev-plus-aosp' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base into lmp-mr1-dev-plus-aosp
Craig Mautner [Tue, 20 Jan 2015 23:58:05 +0000 (23:58 +0000)]
am
f1eb1cdc: am
d22c8d99: Merge "Revert "Remove debugging and skip InputMethod windows"" into lmp-mr1-dev
* commit '
f1eb1cdc65376ea32ece4f7a4c750abe48c9f3c7':
Revert "Remove debugging and skip InputMethod windows"
Craig Mautner [Tue, 20 Jan 2015 23:58:00 +0000 (23:58 +0000)]
am
1388342c: am
088bf3a3: Merge "More debugging for bug
17721767" into lmp-mr1-dev
* commit '
1388342c7f6e9c235d31b01edf3716e83fad3e64':
More debugging for bug
17721767
Craig Mautner [Tue, 20 Jan 2015 23:56:48 +0000 (23:56 +0000)]
am
088bf3a3: Merge "More debugging for bug
17721767" into lmp-mr1-dev
automerge:
1388342
* commit '
1388342c7f6e9c235d31b01edf3716e83fad3e64':
More debugging for bug
17721767
Christopher Tate [Tue, 20 Jan 2015 23:55:00 +0000 (23:55 +0000)]
am
77c96dd8: Merge "Don\'t launch broadcast receiver processes during boot" into lmp-mr1-dev
automerge:
8192670
* commit '
8192670937e3dee8e2c521a9ed1118a5782a2912':
Don't launch broadcast receiver processes during boot
Christopher Tate [Tue, 20 Jan 2015 23:52:57 +0000 (23:52 +0000)]
Merge "Don\'t try to launch broadcast receivers during boot" into lmp-mr1-dev automerge:
14c33f6
automerge:
78a05de
* commit '
78a05de82daffdf746c252b49f12ef88073b0459':
Don't try to launch broadcast receivers during boot
Sanket Padawe [Tue, 20 Jan 2015 23:49:54 +0000 (23:49 +0000)]
Merge "Fixed a crash in TelephonyManager while calling getDeviceID()" into lmp-mr1-dev automerge:
e54e760
automerge:
76e9d18
* commit '
76e9d18055d131bede49886c9c86c9f59db3fac4':
Fixed a crash in TelephonyManager while calling getDeviceID()
Jinsuk Kim [Tue, 20 Jan 2015 23:47:44 +0000 (23:47 +0000)]
am
054f2656: Merge "Mark TimeUnit as @SystemApi" into lmp-mr1-dev
automerge:
375ae7b
* commit '
375ae7ba3263ee8eceeb371b170e9181c801c612':
Mark TimeUnit as @SystemApi
Craig Mautner [Tue, 20 Jan 2015 23:12:33 +0000 (23:12 +0000)]
am
d22c8d99: Merge "Revert "Remove debugging and skip InputMethod windows"" into lmp-mr1-dev
* commit '
d22c8d9961340ba1b7d7601d1c99e2557b6a9f0b':
Revert "Remove debugging and skip InputMethod windows"
Craig Mautner [Tue, 20 Jan 2015 23:12:29 +0000 (23:12 +0000)]
am
088bf3a3: Merge "More debugging for bug
17721767" into lmp-mr1-dev
* commit '
088bf3a37a329962efb5e5a42c82f32a2dab77fe':
More debugging for bug
17721767
Christopher Tate [Tue, 20 Jan 2015 23:12:24 +0000 (23:12 +0000)]
am
77c96dd8: Merge "Don\'t launch broadcast receiver processes during boot" into lmp-mr1-dev
* commit '
77c96dd80ac25f91b226eff70034c1a4e81e593b':
Don't launch broadcast receiver processes during boot
Craig Mautner [Tue, 20 Jan 2015 23:07:55 +0000 (23:07 +0000)]
Merge "Revert "Remove debugging and skip InputMethod windows"" into lmp-mr1-dev
Christopher Tate [Tue, 20 Jan 2015 23:02:23 +0000 (23:02 +0000)]
Merge "Don\'t try to launch broadcast receivers during boot" into lmp-mr1-dev
automerge:
14c33f6
* commit '
14c33f6a716f224d1bc821cd8aa062f5734c29bf':
Don't try to launch broadcast receivers during boot
Sanket Padawe [Tue, 20 Jan 2015 22:58:29 +0000 (22:58 +0000)]
Merge "Fixed a crash in TelephonyManager while calling getDeviceID()" into lmp-mr1-dev
automerge:
e54e760
* commit '
e54e760477b95aa0396c3abb2b7452410782b147':
Fixed a crash in TelephonyManager while calling getDeviceID()
Craig Mautner [Tue, 20 Jan 2015 22:57:41 +0000 (22:57 +0000)]
Merge "More debugging for bug
17721767" into lmp-mr1-dev
Dianne Hackborn [Tue, 20 Jan 2015 21:43:32 +0000 (13:43 -0800)]
Fix issue #
19020826: Including timing issues in ANR reason breaks clustering
Also improve service ANR debugging.
Change-Id: I2118ef2811ca3ba676c110639f58d5c21abfb8eb
Christopher Tate [Tue, 20 Jan 2015 22:54:57 +0000 (22:54 +0000)]
Merge "Don't launch broadcast receiver processes during boot" into lmp-mr1-dev
Christopher Tate [Tue, 20 Jan 2015 22:54:53 +0000 (22:54 +0000)]
Merge "Don't try to launch broadcast receivers during boot" into lmp-mr1-dev
Sanket Padawe [Tue, 20 Jan 2015 22:50:02 +0000 (22:50 +0000)]
Merge "Fixed a crash in TelephonyManager while calling getDeviceID()" into lmp-mr1-dev
Craig Mautner [Tue, 20 Jan 2015 22:45:50 +0000 (22:45 +0000)]
Merge "Remove debugging and skip InputMethod windows" into lmp-mr1-dev automerge:
d9a79b5
automerge:
03d7cc3
* commit '
03d7cc3c24e7d89d82394c9d0cfc8e0c3423687f':
Remove debugging and skip InputMethod windows
Jinsuk Kim [Tue, 20 Jan 2015 22:43:34 +0000 (22:43 +0000)]
am
054f2656: Merge "Mark TimeUnit as @SystemApi" into lmp-mr1-dev
* commit '
054f2656a17a438aa6e8c8f6dcd61b1217f41b88':
Mark TimeUnit as @SystemApi
Craig Mautner [Tue, 20 Jan 2015 22:43:32 +0000 (22:43 +0000)]
am
cbb286b8: Merge "Do not defer removal for empty tasks or activities" into lmp-mr1-dev
automerge:
07317da
* commit '
07317da6834cc35fe8fad519bb60f15ba68bcd48':
Do not defer removal for empty tasks or activities
Sanket Padawe [Tue, 20 Jan 2015 22:40:14 +0000 (14:40 -0800)]
Fixed a crash in TelephonyManager while calling getDeviceID()
Bug:
19056848
Change-Id: Ie241b25be212910a177c3ee5b620d646cfdd482f
Jinsuk Kim [Tue, 20 Jan 2015 22:39:52 +0000 (22:39 +0000)]
Merge "Mark TimeUnit as @SystemApi" into lmp-mr1-dev
Craig Mautner [Tue, 20 Jan 2015 22:35:57 +0000 (22:35 +0000)]
Merge "Remove debugging and skip InputMethod windows" into lmp-mr1-dev
automerge:
d9a79b5
* commit '
d9a79b5ba9934429289a634bdd4ad1a375484184':
Remove debugging and skip InputMethod windows
Craig Mautner [Tue, 20 Jan 2015 22:35:25 +0000 (22:35 +0000)]
Revert "Remove debugging and skip InputMethod windows"
This reverts commit
668cae1d4724cf794571f1ee2a3e896984b97db7.
Too soon. I need this for debug.
Change-Id: Ibeaec0139f511cf389049bdb7dae368a7bd8186b
Craig Mautner [Tue, 20 Jan 2015 22:34:00 +0000 (22:34 +0000)]
Merge "Remove debugging and skip InputMethod windows" into lmp-mr1-dev
Jinsuk Kim [Tue, 20 Jan 2015 22:00:00 +0000 (07:00 +0900)]
Mark TimeUnit as @SystemApi
Bug:
18960664
Change-Id: If2c1259b312138bad9416b10f14a8af0f1a222f4
Craig Mautner [Tue, 20 Jan 2015 22:32:16 +0000 (22:32 +0000)]
am
cbb286b8: Merge "Do not defer removal for empty tasks or activities" into lmp-mr1-dev
* commit '
cbb286b8594c56161f2765023a73d8200e426f9b':
Do not defer removal for empty tasks or activities
Christopher Tate [Tue, 20 Jan 2015 22:29:22 +0000 (14:29 -0800)]
Don't try to launch broadcast receivers during boot
It turns out that sysUI visibility / interactivity is racing with
boot, and it's possible in some circumstances for the user to start
the secure camera swipe gesture before formal boot-completed. Make
sure we only send the camera-related broadcast to registered
receivers in that case, otherwise we'll implicitly be asking to
launch other apps before boot, which is forbidden.
Bug
19060618
Change-Id: I7fcf13b5af7b2edfbb4aac06ef04a0fde2c6a0f7
Craig Mautner [Tue, 20 Jan 2015 22:26:10 +0000 (22:26 +0000)]
Merge "Do not defer removal for empty tasks or activities" into lmp-mr1-dev
Christopher Tate [Tue, 20 Jan 2015 22:21:21 +0000 (14:21 -0800)]
Don't launch broadcast receiver processes during boot
Broadcasts that might be sent before the boot process has completed must
be restricted to registered receivers, at least while still in the
middle of booting.
Bug
19060618
Change-Id: Ib4e0990cf252f34344f7a0bd19a0e72919013e0f
Ying Wang [Tue, 20 Jan 2015 22:01:26 +0000 (22:01 +0000)]
am
b5108949: am
e4a031e3: Merge "New trick to install bad dex file."
* commit '
b51089499c8c39fce47deccf70d3ea069c58b471':
New trick to install bad dex file.
Craig Mautner [Tue, 20 Jan 2015 19:56:27 +0000 (11:56 -0800)]
Do not defer removal for empty tasks or activities
It is possible for empty activities to be leaked if their last
window is removed before animations finish. This change keeps tasks
and activities from having removal deferred if they have no windows.
Fixes bug
19047432
Change-Id: If6562f46bbfcac9ba987e2c834a1d55a9a8f3766
Adam Lesinski [Tue, 20 Jan 2015 21:55:12 +0000 (21:55 +0000)]
am
aee7225e: Merge "Process base APK" into lmp-mr1-dev
automerge:
554a6f5
* commit '
554a6f5278ec05077d8252249afc911897fbfe76':
Process base APK
Ying Wang [Tue, 20 Jan 2015 21:50:14 +0000 (21:50 +0000)]
am
e4a031e3: Merge "New trick to install bad dex file."
* commit '
e4a031e3c3b234ff91ce62e95b788eca7e00082c':
New trick to install bad dex file.
Adam Lesinski [Tue, 20 Jan 2015 21:48:03 +0000 (21:48 +0000)]
am
aee7225e: Merge "Process base APK" into lmp-mr1-dev
* commit '
aee7225e34376a90e8c25e5df53604085cc1b712':
Process base APK
Christopher Tate [Tue, 20 Jan 2015 21:45:08 +0000 (21:45 +0000)]
Merge "Don\'t write widget metadata to backup unless it\'s new/changed" into lmp-mr1-dev automerge:
7651dcb
automerge:
5afc62c
* commit '
5afc62cd39403c12a253101b12c52f440843bdaf':
Don't write widget metadata to backup unless it's new/changed
Ying Wang [Tue, 20 Jan 2015 21:43:51 +0000 (21:43 +0000)]
Merge "New trick to install bad dex file."
Adam Lesinski [Tue, 20 Jan 2015 21:41:45 +0000 (21:41 +0000)]
Merge "Process base APK" into lmp-mr1-dev
Christopher Tate [Tue, 20 Jan 2015 21:26:56 +0000 (21:26 +0000)]
Merge "Don\'t write widget metadata to backup unless it\'s new/changed" into lmp-mr1-dev
automerge:
7651dcb
* commit '
7651dcb92193a5a970a2554e067ec14d6fcad802':
Don't write widget metadata to backup unless it's new/changed
Christopher Tate [Tue, 20 Jan 2015 21:23:59 +0000 (21:23 +0000)]
Merge "Don't write widget metadata to backup unless it's new/changed" into lmp-mr1-dev
Wale Ogunwale [Tue, 20 Jan 2015 21:10:01 +0000 (21:10 +0000)]
am
92dd1abe: Update restored task uid to match the package uid on current device.
automerge:
7fd985f
* commit '
7fd985f2c69f600f7530311ac9b7c9af196dc0e0':
Update restored task uid to match the package uid on current device.
Wale Ogunwale [Tue, 20 Jan 2015 20:58:26 +0000 (20:58 +0000)]
am
92dd1abe: Update restored task uid to match the package uid on current device.
* commit '
92dd1abef4c0a22db40c5f7bbd100e6b471a1ad3':
Update restored task uid to match the package uid on current device.
Wale Ogunwale [Thu, 15 Jan 2015 23:36:48 +0000 (15:36 -0800)]
Update restored task uid to match the package uid on current device.
The uid on the task we are restoring from another device are
meaningless on the current device. Change updates the uid of any
task we restore to match the package uid on the current device.
Bug:
19014377
Change-Id: I285fbe9f509cae3d2e9a212a59e88f34b4db20e5
Ying Wang [Thu, 15 Jan 2015 00:18:51 +0000 (16:18 -0800)]
New trick to install bad dex file.
Previously we use LOCAL_JAVA_RESOURCE_FILES to override the normally
generated classes.dex with a bad dex file.
Now as we have moved Java resource processing before running jarjar, dx
would fail for the bad classes.dex inside the classes.jar.
Instead we override the target specific variable PRIVATE_DEX_FILE to
inject the bad dex file.
(cherry-picked from commit
f122d90c290c789e0d0085127beebdcf1935c127)
Bug:
18837479
Change-Id: I73f82c8a15e1d8935d9c2f290ba9456184a56ec7
Kenny Guy [Mon, 19 Jan 2015 16:26:07 +0000 (16:26 +0000)]
Only hide cross profile disclosure when showing resolver.
Hiding the cross profile discoloure for all system apps
also meant it wasn't shown for CALL_PRIVILEGED intents.
Bug:
18702461
Change-Id: I8129bc4b07573b547aefe2dbcc6938a60305c216
Ricardo Cervera [Tue, 20 Jan 2015 19:07:11 +0000 (19:07 +0000)]
am
7c002d75: am
98f07d90: am
92f6a747: docs: Added info on noHistory and onActivityResult(). Bug:
13807256 automerge:
e8f6bd4 automerge:
eada048 automerge:
458f432 automerge:
47e274c
automerge:
046dc08
* commit '
046dc08962fcf0ea32597859c3ef80afea0d4069':
Craig Mautner [Tue, 20 Jan 2015 18:49:22 +0000 (10:49 -0800)]
More debugging for bug
17721767
Narrow down why GEL is being resumed instead of the top stack.
Change-Id: I79c0be4adf0ccee30e1a5aa4308ee91148f239fa
Ricardo Cervera [Tue, 20 Jan 2015 18:38:40 +0000 (18:38 +0000)]
am
7c002d75: am
98f07d90: am
92f6a747: docs: Added info on noHistory and onActivityResult(). Bug:
13807256 automerge:
e8f6bd4 automerge:
eada048 automerge:
458f432 automerge:
47e274c
* commit '
7c002d75b62585c3598a4a5a93647a3323e90b8d':
Ricardo Cervera [Tue, 20 Jan 2015 18:32:22 +0000 (18:32 +0000)]
am
98f07d90: am
92f6a747: docs: Added info on noHistory and onActivityResult(). Bug:
13807256 automerge:
e8f6bd4 automerge:
eada048 automerge:
458f432
automerge:
47e274c
* commit '
47e274c56a0662e3e2aef24f2a458cc078e70fd8':
Ricardo Cervera [Tue, 20 Jan 2015 18:10:49 +0000 (18:10 +0000)]
am
98f07d90: am
92f6a747: docs: Added info on noHistory and onActivityResult(). Bug:
13807256 automerge:
e8f6bd4 automerge:
eada048
automerge:
458f432
* commit '
458f4326bdff638cefe175b179a487872cf678c1':
Ricardo Cervera [Tue, 20 Jan 2015 18:03:50 +0000 (18:03 +0000)]
am
98f07d90: am
92f6a747: docs: Added info on noHistory and onActivityResult(). Bug:
13807256 automerge:
e8f6bd4
automerge:
eada048
* commit '
eada048addc14a95ced54b17c6a75f5f899e2c2a':
Ricardo Cervera [Tue, 20 Jan 2015 17:57:45 +0000 (17:57 +0000)]
am
98f07d90: am
92f6a747: docs: Added info on noHistory and onActivityResult(). Bug:
13807256
automerge:
e8f6bd4
* commit '
e8f6bd484627e16fa2fd9509b0f06056ee44be94':
docs: Added info on noHistory and onActivityResult(). Bug:
13807256
Neil Fuller [Tue, 20 Jan 2015 15:29:55 +0000 (15:29 +0000)]
am
aa3a45ba: am
42c2ac00: Merge "Fix for broken docs build."
* commit '
aa3a45ba5bc78ab4015a1d2c4c361d3f54118d8e':
Fix for broken docs build.
Neil Fuller [Tue, 20 Jan 2015 15:24:35 +0000 (15:24 +0000)]
am
42c2ac00: Merge "Fix for broken docs build."
* commit '
42c2ac00e6e6e8fcfd15dcfbc6d70eabc709d904':
Fix for broken docs build.
Neil Fuller [Tue, 20 Jan 2015 15:18:59 +0000 (15:18 +0000)]
Merge "Fix for broken docs build."
Neil Fuller [Tue, 20 Jan 2015 15:08:20 +0000 (15:08 +0000)]
Fix for broken docs build.
Broken by commit
50a01d89606b40dd151ad407d05c3b2867bbdbad
Change-Id: Iab460aa6254d320349f67e747f763bbf06d3e9e7
Neil Fuller [Tue, 20 Jan 2015 13:21:58 +0000 (13:21 +0000)]
resolved conflicts for merge of
7382c02d to lmp-mr1-dev-plus-aosp
Change-Id: Idfa2750230aa56e7ae34fcc33d62558df942abd0
Neil Fuller [Tue, 20 Jan 2015 12:56:34 +0000 (12:56 +0000)]
am
00502e89: Merge "Changes associated with an OkHttp upgrade"
* commit '
00502e89603fa460cfd29d8759d74e38946105d4':
Changes associated with an OkHttp upgrade
Neil Fuller [Tue, 20 Jan 2015 12:50:47 +0000 (12:50 +0000)]
Merge "Changes associated with an OkHttp upgrade"
Neil Fuller [Mon, 12 Jan 2015 16:49:06 +0000 (16:49 +0000)]
Changes associated with an OkHttp upgrade
Change-Id: I2a4db602aa7ffdef886e0f1a955715a2551a87a5
Narayan Kamath [Mon, 19 Jan 2015 16:05:24 +0000 (16:05 +0000)]
Choose the right executable for wrapped applications.
64 bit zygotes should exec app_process64, whereas 32 bit
zygotes should exec app_process32.
Change-Id: I63b56400e0478cd2bb206c98da6858be558f0525
Narayan Kamath [Mon, 19 Jan 2015 15:21:30 +0000 (15:21 +0000)]
am
17f50f81: am
d8beca64: Merge "Remove support for --classpath and make --runtime-init the default."
* commit '
17f50f8119f4a8bdec304cde527f68ddd0b3bc0a':
Remove support for --classpath and make --runtime-init the default.
Narayan Kamath [Mon, 19 Jan 2015 15:16:58 +0000 (15:16 +0000)]
am
3e809794: am
e315feea: Merge "Fix handling of wrapped processes [part 1]."
* commit '
3e809794fe558d8a10851c0ac22a65a2c81fa315':
Fix handling of wrapped processes [part 1].
Narayan Kamath [Mon, 19 Jan 2015 15:14:02 +0000 (15:14 +0000)]
am
d8beca64: Merge "Remove support for --classpath and make --runtime-init the default."
* commit '
d8beca64e086a9c4a214c7dcb9b6e59c2c482173':
Remove support for --classpath and make --runtime-init the default.
Geoff Mendal [Mon, 19 Jan 2015 15:11:59 +0000 (15:11 +0000)]
am
8a28956d: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
* commit '
8a28956d5e55baa47aafb8a10003b995f6bc734d':
Import translations. DO NOT MERGE
Narayan Kamath [Mon, 19 Jan 2015 15:09:16 +0000 (15:09 +0000)]
Merge "Remove support for --classpath and make --runtime-init the default."
Geoff Mendal [Mon, 19 Jan 2015 15:07:37 +0000 (15:07 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
Geoff Mendal [Mon, 19 Jan 2015 15:05:41 +0000 (15:05 +0000)]
am
c7f4582c: (-s ours) am
2bc2a994: (-s ours) Import translations. DO NOT MERGE
* commit '
c7f4582c410760105e9eac10597fd5a23257685b':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 19 Jan 2015 15:05:34 +0000 (09:05 -0600)]
Import translations. DO NOT MERGE
Change-Id: Ibcf24ef2774ef4c96d75daca257c202686e630da
Auto-generated-cl: translation import
Narayan Kamath [Mon, 19 Jan 2015 15:05:02 +0000 (15:05 +0000)]
am
e315feea: Merge "Fix handling of wrapped processes [part 1]."
* commit '
e315feeaff544b1d4dd173f0e341398906f4c0c9':
Fix handling of wrapped processes [part 1].
Narayan Kamath [Thu, 8 Jan 2015 12:45:37 +0000 (12:45 +0000)]
Remove support for --classpath and make --runtime-init the default.
--classpath hasn't been properly supported or used for as long as
git history exists, and the non --runtime-init classpath is useless
without it.
Also, forking and exec' a bare dalvikvm instance from the zygote seems
somewhat pointless since we might as well just execute it directly.
Change-Id: Ib07d822d448e7b431d7564381f9cd11735fd1113
Narayan Kamath [Mon, 19 Jan 2015 15:00:00 +0000 (15:00 +0000)]
Merge "Fix handling of wrapped processes [part 1]."