OSDN Git Service
Deepanshu Gupta [Sat, 12 Apr 2014 02:30:31 +0000 (02:30 +0000)]
am
e2dc6985: am
f1334ccc: am
849a8208: Add DatePickerDialog to layoutlib [DO NOT MERGE]
* commit '
e2dc69856879d41798545b2c113098195bf04fa6':
Add DatePickerDialog to layoutlib [DO NOT MERGE]
Deepanshu Gupta [Sat, 12 Apr 2014 02:26:09 +0000 (02:26 +0000)]
am
f1334ccc: am
849a8208: Add DatePickerDialog to layoutlib [DO NOT MERGE]
* commit '
f1334ccc1522241c0efc2449ed8bf472a5b01204':
Add DatePickerDialog to layoutlib [DO NOT MERGE]
Deepanshu Gupta [Sat, 12 Apr 2014 02:23:04 +0000 (02:23 +0000)]
am
849a8208: Add DatePickerDialog to layoutlib [DO NOT MERGE]
* commit '
849a8208c88d38e55ec13a1fa76bf295fde96cb5':
Add DatePickerDialog to layoutlib [DO NOT MERGE]
Jeff Brown [Sat, 12 Apr 2014 01:58:57 +0000 (01:58 +0000)]
am
d912e1f6: Use the display\'s actual state in the view hierarchy.
* commit '
d912e1f6a111fb33118d116bd72da1a328041bca':
Use the display's actual state in the view hierarchy.
Jeff Brown [Sat, 12 Apr 2014 01:46:22 +0000 (18:46 -0700)]
Use the display's actual state in the view hierarchy.
Previously, the view hierarchy would suppress drawing whenever the
PowerManager.isScreenOn() method returned false. However, this method
really describes the interactive state of the device rather than the
actual display state. This is especially a problem when there are
multiple displays but it also breaks drawing while in doze mode.
This change makes the view hierarchy consider the actual state of the
display instead on an individual basis.
Bug:
13133142
Change-Id: I69870b6b14a3504607a30562aa48c3452f777c1f
Aravind Akella [Fri, 11 Apr 2014 19:34:51 +0000 (19:34 +0000)]
am
cd4c1c71: Merge "Add stringType and requiredPermissions to SensorManager.java, as well as a permission for the heart rate sensor" into klp-modular-dev
* commit '
cd4c1c714c37a1bc7ba35ebd2509eca4f0f6a314':
Add stringType and requiredPermissions to SensorManager.java, as well as a permission for the heart rate sensor
Aravind Akella [Fri, 11 Apr 2014 19:32:38 +0000 (19:32 +0000)]
Merge "Add stringType and requiredPermissions to SensorManager.java, as well as a permission for the heart rate sensor" into klp-modular-dev
Jose Lima [Fri, 11 Apr 2014 18:58:43 +0000 (18:58 +0000)]
am
970417c7: Added getLeanbackLaunchIntentForPackage()
* commit '
970417c7d3e33ccbd6918e28d9bc5da24651f5b3':
Added getLeanbackLaunchIntentForPackage()
Narayan Kamath [Fri, 11 Apr 2014 18:36:32 +0000 (18:36 +0000)]
am
97953b30: am
4f4892d0: Merge "Workaround 64 bit devices that don\'t have zygotes yet."
* commit '
97953b308f9159a73061ae047e368eac503c1931':
Workaround 64 bit devices that don't have zygotes yet.
Narayan Kamath [Fri, 11 Apr 2014 18:33:00 +0000 (18:33 +0000)]
am
4f4892d0: Merge "Workaround 64 bit devices that don\'t have zygotes yet."
* commit '
4f4892d00aab13975a8aed000f84ae0320355fd7':
Workaround 64 bit devices that don't have zygotes yet.
Narayan Kamath [Fri, 11 Apr 2014 18:29:54 +0000 (18:29 +0000)]
Merge "Workaround 64 bit devices that don't have zygotes yet."
Narayan Kamath [Fri, 11 Apr 2014 17:44:31 +0000 (18:44 +0100)]
Workaround 64 bit devices that don't have zygotes yet.
This can be fixed by tweaking their BoardConfig as well,
but that leads to all sorts of other problems.
For now, fall back to the primary zygote if the secondary
is unavailable. This will fail if shared libraries for the
primary zygote ABI are unavailable, but that won't be the
case just yet.
bug:
13970103
Change-Id: Ifa107e43ca95023d57a0d9c641e4fddaccd9a888
Jose Lima [Thu, 10 Apr 2014 17:42:19 +0000 (10:42 -0700)]
Added getLeanbackLaunchIntentForPackage()
Change-Id: I23be3bfa59be812a915adc37e08fdf59be8ad90f
Elliott Hughes [Fri, 11 Apr 2014 17:44:51 +0000 (17:44 +0000)]
am
70bba904: am
b093e485: Merge "generateProjectThumbnail can fail to close output stream"
* commit '
70bba904fc50f44cb4a695cf76e423534c835cf6':
generateProjectThumbnail can fail to close output stream
Elliott Hughes [Fri, 11 Apr 2014 17:41:44 +0000 (17:41 +0000)]
am
b093e485: Merge "generateProjectThumbnail can fail to close output stream"
* commit '
b093e485bbd790cc4d9678451c8cce4d361c2cf2':
generateProjectThumbnail can fail to close output stream
Elliott Hughes [Fri, 11 Apr 2014 17:37:54 +0000 (17:37 +0000)]
Merge "generateProjectThumbnail can fail to close output stream"
Elliott Hughes [Fri, 11 Apr 2014 17:37:18 +0000 (17:37 +0000)]
am
1ea1857d: am
8cd319b8: Merge "Add additional languages to be accepted by the NumberPicker input filter"
* commit '
1ea1857de9c98199015f0188678a12a82a6248d4':
Add additional languages to be accepted by the NumberPicker input filter
Elliott Hughes [Fri, 11 Apr 2014 17:33:15 +0000 (17:33 +0000)]
am
8cd319b8: Merge "Add additional languages to be accepted by the NumberPicker input filter"
* commit '
8cd319b84635454746803b0eed7e2626d7945a09':
Add additional languages to be accepted by the NumberPicker input filter
Elliott Hughes [Fri, 11 Apr 2014 17:30:09 +0000 (17:30 +0000)]
Merge "Add additional languages to be accepted by the NumberPicker input filter"
Elliott Hughes [Fri, 11 Apr 2014 17:21:20 +0000 (17:21 +0000)]
am
90e2301e: am
d2a11d97: Merge "Add explicit close of Scanner input"
* commit '
90e2301e23532c92dd4c24394b7407e243389e9f':
Add explicit close of Scanner input
Elliott Hughes [Fri, 11 Apr 2014 17:18:14 +0000 (17:18 +0000)]
am
d2a11d97: Merge "Add explicit close of Scanner input"
* commit '
d2a11d97a94bed18629bded429f118f57f4f7821':
Add explicit close of Scanner input
Elliott Hughes [Fri, 11 Apr 2014 17:14:39 +0000 (17:14 +0000)]
Merge "Add explicit close of Scanner input"
Ricardo Cervera [Fri, 11 Apr 2014 16:19:09 +0000 (16:19 +0000)]
am
3d9a3b58: am
7abc67f4: am
2abf55ca: Merge "docs: Updated SDK installation instructions for Ubuntu. Bug:
13476147" into klp-docs
* commit '
3d9a3b589af661f980a7c03f208915b54521639f':
docs: Updated SDK installation instructions for Ubuntu. Bug:
13476147
Ricardo Cervera [Fri, 11 Apr 2014 16:19:06 +0000 (16:19 +0000)]
am
7186228a: am
d1f51fda: am
a765e782: Merge "docs: Added a document on debugging in Android Studio" into klp-docs
* commit '
7186228ae8505c3222be81680811d00de9bbdb6d':
docs: Added a document on debugging in Android Studio
Ricardo Cervera [Fri, 11 Apr 2014 16:14:23 +0000 (16:14 +0000)]
am
7abc67f4: am
2abf55ca: Merge "docs: Updated SDK installation instructions for Ubuntu. Bug:
13476147" into klp-docs
* commit '
7abc67f43fff9d2dc84d1bddfb3e5b3a04fbc30a':
docs: Updated SDK installation instructions for Ubuntu. Bug:
13476147
Ricardo Cervera [Fri, 11 Apr 2014 16:14:17 +0000 (16:14 +0000)]
am
d1f51fda: am
a765e782: Merge "docs: Added a document on debugging in Android Studio" into klp-docs
* commit '
d1f51fda68ee23aaa83db62b32ad2b65d7fb4320':
docs: Added a document on debugging in Android Studio
Ricardo Cervera [Fri, 11 Apr 2014 16:11:59 +0000 (16:11 +0000)]
am
2abf55ca: Merge "docs: Updated SDK installation instructions for Ubuntu. Bug:
13476147" into klp-docs
* commit '
2abf55ca9b8a796ffb246538d319798dabedbec6':
docs: Updated SDK installation instructions for Ubuntu. Bug:
13476147
Ricardo Cervera [Fri, 11 Apr 2014 16:11:56 +0000 (16:11 +0000)]
am
a765e782: Merge "docs: Added a document on debugging in Android Studio" into klp-docs
* commit '
a765e78241970f212991056b09027ef4df818d95':
docs: Added a document on debugging in Android Studio
Ricardo Cervera [Fri, 11 Apr 2014 16:07:47 +0000 (16:07 +0000)]
Merge "docs: Updated SDK installation instructions for Ubuntu. Bug:
13476147" into klp-docs
Ricardo Cervera [Fri, 11 Apr 2014 16:06:22 +0000 (16:06 +0000)]
Merge "docs: Added a document on debugging in Android Studio" into klp-docs
Narayan Kamath [Fri, 11 Apr 2014 11:35:19 +0000 (11:35 +0000)]
am
af42a91c: Fix another build breakage.
* commit '
af42a91c118941d463b474574bf34bf05822350d':
Fix another build breakage.
Narayan Kamath [Fri, 11 Apr 2014 11:28:10 +0000 (12:28 +0100)]
Fix another build breakage.
Caused by
037c33eae74bee2774897d969d48947f9abe254f, which
was submitted without a checkbuild.
Change-Id: I0d48f6b941cc98a30904cdfbd7bcb56ed509734e
Narayan Kamath [Fri, 11 Apr 2014 10:54:20 +0000 (10:54 +0000)]
Narayan Kamath [Fri, 11 Apr 2014 10:42:33 +0000 (11:42 +0100)]
Fix build.
isScreenOn was changed to isInteractive.
Change-Id: I381d0b0ca745b61e64ac6309c2a6307696f52be0
Narayan Kamath [Fri, 11 Apr 2014 09:57:27 +0000 (09:57 +0000)]
am
de442781: am
909a6a0e: Merge "Dual zygote cleanup."
* commit '
de442781cd4f7404e8aaa3f7ca5d1d3fc28cccc6':
Dual zygote cleanup.
Jinsuk Kim [Fri, 11 Apr 2014 09:40:46 +0000 (09:40 +0000)]
am
b11f250e: Merge "Delegate HdmiCecService method impl to HdmiCecDevice subclass" into klp-modular-dev
* commit '
b11f250e09195d1ab250c93bfed0b31ed3a40f3d':
Delegate HdmiCecService method impl to HdmiCecDevice subclass
Jinsuk Kim [Fri, 11 Apr 2014 09:38:22 +0000 (09:38 +0000)]
Merge "Delegate HdmiCecService method impl to HdmiCecDevice subclass" into klp-modular-dev
Jinsuk Kim [Mon, 7 Apr 2014 04:39:17 +0000 (13:39 +0900)]
Delegate HdmiCecService method impl to HdmiCecDevice subclass
Most of the methods in the interface IHdmiCecService should be implemented
based on the device type. This CL makes a change such that the HdmiCecDevice
just has stub methods that should be overriden by subclasses.
Other changes:
- Fixed a bug of <Inactive Source> not sending its physical address
in its message body. Also the command should have been sent to TV
only rather than broadcast.
- Put back sendGiveDevicePowerStatus interface method. It allows the client
to keep track of the other device(like TV) power status more closely.
Devices goes through the status from standby -> transient to on -> on
but the CEC spec doesn't require that they broacast it actively.
The restored method can be used to let the playback device to get
up-to-date power status of TV/display when it is booting up.
This method should work the same across all the device types. So it was
implemented in the service, not delegated to HdmiCecDevice.
- Send <Report Physical Address> when a new logical device is registered,
which is required by CEC spec: "it should report the association between
its logical and physical address by broadcasting <Report Physical
Address>
Change-Id: Iac1d2cf5783d947f2dcd6965a54670fbdb8e6a63
Narayan Kamath [Fri, 11 Apr 2014 08:45:47 +0000 (08:45 +0000)]
am
909a6a0e: Merge "Dual zygote cleanup."
* commit '
909a6a0e2b5815332618b2cf731d27824a76d042':
Dual zygote cleanup.
Narayan Kamath [Fri, 11 Apr 2014 08:24:52 +0000 (08:24 +0000)]
Merge "Dual zygote cleanup."
Jeff Brown [Fri, 11 Apr 2014 03:49:37 +0000 (03:49 +0000)]
am
f24687e2: Merge "Plumb display power state through display manager." into klp-modular-dev
* commit '
f24687e2731811fd0e3803b691fd47a659f89329':
Plumb display power state through display manager.
Jeff Brown [Fri, 11 Apr 2014 03:47:08 +0000 (03:47 +0000)]
Merge "Plumb display power state through display manager." into klp-modular-dev
Jeff Brown [Wed, 9 Apr 2014 07:31:55 +0000 (00:31 -0700)]
Plumb display power state through display manager.
Declare a new method, Display.getState() to retrieve the actual
power state of a display.
Improved documentation for Intent.ACTION_SCREEN_ON and
Intent.ACTION_SCREEN_OFF to clarify what they really mean in
terms of the interactive state of the device.
Deprecated PowerManager.isScreenOn() and replaced it with
PowerManager.isInteractive() with a more suggestive name and
better documentation.
Redirect display power state changes to go through the display
manager first and only then head over to the power manager for
legacy compatibility.
Eliminated the bright here and woke here policy flags since they
were unused. Simplified the input dispatch policy somewhat.
Ensure that screen wake locks are respected up until the point
when dozing really begins.
Fixed a regression in DreamService where onDreamingStarted
might be called before onWindowAttached.
Bug:
13133142
Bug:
13472578
Bug:
13929355
Bug:
13760290
Change-Id: Iabef96921dd554ce3768fb18619cefc3230b5fb0
Aravind Akella [Mon, 7 Apr 2014 22:55:21 +0000 (22:55 +0000)]
Add stringType and requiredPermissions to SensorManager.java, as well as a permission for the heart rate sensor
This reverts commit
819239e5bec90ee3c861ac45fffac4a832a183a1.
Change-Id: I4bbb222e5c9dc65aed03aa28fd9e0f00fe335819
Ricardo Cervera [Fri, 28 Mar 2014 00:14:35 +0000 (17:14 -0700)]
docs: Added a document on debugging in Android Studio
Change-Id: I073e1db6d7976db0f658aac4aa377877ed931aa2
Baligh Uddin [Thu, 10 Apr 2014 15:55:25 +0000 (15:55 +0000)]
am
da6b9599: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev
* commit '
da6b9599c77230c689d63e32ca80b62f60f18c27':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 10 Apr 2014 15:51:37 +0000 (15:51 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-modular-dev
Narayan Kamath [Thu, 10 Apr 2014 11:25:56 +0000 (11:25 +0000)]
am
940e76fd: am
b827f78e: Merge "Removed android.debug.JNITest from preloaded-classes"
* commit '
940e76fd378cebcd0d83099a5c31bc1e2bbeb2ba':
Removed android.debug.JNITest from preloaded-classes
Narayan Kamath [Thu, 10 Apr 2014 11:21:33 +0000 (11:21 +0000)]
am
b827f78e: Merge "Removed android.debug.JNITest from preloaded-classes"
* commit '
b827f78e7acee3a604c315615268edf7098dc184':
Removed android.debug.JNITest from preloaded-classes
Narayan Kamath [Thu, 10 Apr 2014 11:18:28 +0000 (11:18 +0000)]
Merge "Removed android.debug.JNITest from preloaded-classes"
Narayan Kamath [Thu, 10 Apr 2014 11:13:06 +0000 (12:13 +0100)]
Dual zygote cleanup.
- Use different process names for the 32 / 64 bit zygote.
- Pass command line arguments correctly. The first unmatched
argument must be passed through to the java main class.
Change-Id: I952ebbdbba941f118d992354b9bd0ada2dade417
Narayan Kamath [Thu, 10 Apr 2014 09:26:59 +0000 (09:26 +0000)]
am
1d26a3f1: am
09e13cc5: Merge "System services detect and register app CPU ABIs"
* commit '
1d26a3f1efd0d965e8751e8515608c31789bdbe2':
System services detect and register app CPU ABIs
Narayan Kamath [Thu, 10 Apr 2014 09:26:44 +0000 (09:26 +0000)]
am
0fd40cb1: am
80413c9f: Merge "Re-implement native library search and copies."
* commit '
0fd40cb100bccbd5d9ad6109ca39c818a857f889':
Re-implement native library search and copies.
Narayan Kamath [Thu, 10 Apr 2014 09:23:33 +0000 (09:23 +0000)]
am
09e13cc5: Merge "System services detect and register app CPU ABIs"
* commit '
09e13cc5f9f98382376eb49bfa6ceb94a50d37a1':
System services detect and register app CPU ABIs
Narayan Kamath [Thu, 10 Apr 2014 09:23:30 +0000 (09:23 +0000)]
am
80413c9f: Merge "Re-implement native library search and copies."
* commit '
80413c9fe10acf36eaecd139198c7fc17e8af2e6':
Re-implement native library search and copies.
Narayan Kamath [Thu, 10 Apr 2014 09:20:21 +0000 (09:20 +0000)]
Merge "System services detect and register app CPU ABIs"
Narayan Kamath [Thu, 10 Apr 2014 09:19:38 +0000 (09:19 +0000)]
Merge "Re-implement native library search and copies."
Deepanshu Gupta [Tue, 25 Feb 2014 23:27:29 +0000 (15:27 -0800)]
Add DatePickerDialog to layoutlib [DO NOT MERGE]
Includes android.app.DatePickerDialog in the layoutlib.jar
Bug: http://b.android.com/28318
Change-Id: I583dde4a8b88204bf98bfca8d91470e1aa4719ce
(cherry picked from commit
c2016d4073c61e87439d4fa14837b397a3c1630a)
Zhihai Xu [Wed, 9 Apr 2014 23:50:39 +0000 (23:50 +0000)]
am
2e8a2d20: Merge "LE: Return false if an attribute read/write is in progress" into klp-modular-dev
* commit '
2e8a2d207f446e156a8cfb9532cdfb569caa9458':
LE: Return false if an attribute read/write is in progress
Jesse Gunsch [Wed, 9 Apr 2014 23:50:35 +0000 (23:50 +0000)]
am
8d31358f: Merge "Merge "NsdService does not clean up after exiting clients"" into klp-modular-dev
* commit '
8d31358fb4f0f948fcfd07399d4247375dc5eea9':
Merge "NsdService does not clean up after exiting clients"
Jeff Brown [Wed, 9 Apr 2014 23:47:40 +0000 (16:47 -0700)]
resolved conflicts for merge of
7289f3ab to klp-modular-dev-plus-aosp
Change-Id: I5bdc8862828b56557410a95e7f9b14def81a0ded
Zhihai Xu [Wed, 9 Apr 2014 18:19:04 +0000 (18:19 +0000)]
Merge "LE: Return false if an attribute read/write is in progress" into klp-modular-dev
Jesse Gunsch [Wed, 9 Apr 2014 18:09:02 +0000 (18:09 +0000)]
Merge "Merge "NsdService does not clean up after exiting clients"" into klp-modular-dev
Andre Eisenbach [Tue, 18 Mar 2014 21:26:51 +0000 (14:26 -0700)]
LE: Return false if an attribute read/write is in progress
bug:
12109128
Change-Id: I0155fcddc850aba47a1bf3e174d4ee582d50b187
Baligh Uddin [Wed, 9 Apr 2014 16:53:03 +0000 (09:53 -0700)]
Import translations. DO NOT MERGE
Change-Id: I974afb393ebd8cf341012d3c08cad60b578cda30
Auto-generated-cl: translation import
Ramin Zaghi [Tue, 1 Apr 2014 14:02:29 +0000 (15:02 +0100)]
System services detect and register app CPU ABIs
This patch uses the NativeLibraryHelper class to
match native libraries in an .apk package with
those listed in 'ro.cpu.abilist' property.
The result is stored in packages.xml and the
ApplicationInfo class.
This information will be used by the ActivityManager
to decide which zygote to use to launch the given
app.
Change-Id: I3ec3d050996d8f4621f286ca331b9ad47ea26fa0
Ramin Zaghi [Fri, 28 Feb 2014 15:03:19 +0000 (15:03 +0000)]
Re-implement native library search and copies.
We now use a two step approach :
- First we look through the list of shared libraries in an
APK, and choose an ABI based on the (priority) list of ABIs
a given device supports.
- Then we look through the list of shared libraries and copy
all shared libraries that match the ABI we've selected.
This fixes a long-standing bug where we would sometimes copy
a mixture of different ABIs to the device, and also allows us
to clearly pick an ABI to run an app with.
The code in NativeLibraryHelper has been refactored so that all
file name validation & matching logic is done in a single place
(NativeLibrariesIterator). This allows us to avoid a lot of
redundant logic and straightens out a few corner cases (for eg.
where the abi determination & copying logic do not agree on
what files to skip).
bug: https://code.google.com/p/android/issues/detail?id=65053
bug:
13647418
Change-Id: I34d08353f24115b0f6b800a7eda3ac427fa25fef
Co-Authored-By: Zhenghua Wang <zhenghua.wang0923@gmail.com>
Co-Authored-By: Ramin Zaghi <ramin.zaghi@arm.com>
Co-Authored-By: Narayan Kamath <narayan@google.com>
Mark Salyzyn [Wed, 9 Apr 2014 16:14:41 +0000 (16:14 +0000)]
am
7a67c927: am
ecdf9b19: Merge "jni: liblog reading error API incorrect"
* commit '
7a67c927e622bb176b21455b8ed56c76b8e0f602':
jni: liblog reading error API incorrect
Mark Salyzyn [Wed, 9 Apr 2014 16:11:04 +0000 (16:11 +0000)]
am
ecdf9b19: Merge "jni: liblog reading error API incorrect"
* commit '
ecdf9b199ac9659c37c34c0b23084199acea80bf':
jni: liblog reading error API incorrect
Mark Salyzyn [Wed, 9 Apr 2014 16:07:47 +0000 (16:07 +0000)]
Merge "jni: liblog reading error API incorrect"
Narayan Kamath [Wed, 9 Apr 2014 14:19:46 +0000 (14:19 +0000)]
am
b6ab8c17: am
a6f5e79d: Merge "Allow connections to multiple zygotes."
* commit '
b6ab8c17bd0163bf07ff3dbe03ab352d58b61cb3':
Allow connections to multiple zygotes.
Narayan Kamath [Wed, 9 Apr 2014 14:15:16 +0000 (14:15 +0000)]
am
a6f5e79d: Merge "Allow connections to multiple zygotes."
* commit '
a6f5e79dd182b05909fa53109e74638afcd7ee12':
Allow connections to multiple zygotes.
Narayan Kamath [Wed, 9 Apr 2014 14:12:22 +0000 (14:12 +0000)]
Merge "Allow connections to multiple zygotes."
Narayan Kamath [Thu, 3 Apr 2014 19:15:15 +0000 (20:15 +0100)]
Allow connections to multiple zygotes.
Adds a new String argument "abi" to Process.start.
This method will now query the zygotes to
determine what ABIs the primary and the secondary
zygote support (the secondary is optional) and dispatch
a fork request over the right zygote connection.
Both zygotes are assumed to be active at all points.
Change-Id: I460319b4481ff1c1666e8172223691820658a35c
Narayan Kamath [Wed, 9 Apr 2014 14:02:18 +0000 (14:02 +0000)]
am
05f980d4: am
d4b64409: Merge "Make zygotes aware of their supported ABIs."
* commit '
05f980d42d4926ab2130cdcf9e646eb610a7080b':
Make zygotes aware of their supported ABIs.
Narayan Kamath [Wed, 9 Apr 2014 14:02:08 +0000 (14:02 +0000)]
am
3856a219: am
cecfb94f: Merge "Clean up argc / argv processing for runtime args."
* commit '
3856a219fa414ee53c5ef3a0c35dae35e2ca80b1':
Clean up argc / argv processing for runtime args.
Narayan Kamath [Wed, 9 Apr 2014 13:59:00 +0000 (13:59 +0000)]
am
d4b64409: Merge "Make zygotes aware of their supported ABIs."
* commit '
d4b644092e8d2719d01ad297b080bd50b1fdf60d':
Make zygotes aware of their supported ABIs.
Narayan Kamath [Wed, 9 Apr 2014 13:58:57 +0000 (13:58 +0000)]
am
cecfb94f: Merge "Clean up argc / argv processing for runtime args."
* commit '
cecfb94f3f1b2978ba66342d7920e83770c808e3':
Clean up argc / argv processing for runtime args.
Narayan Kamath [Wed, 9 Apr 2014 13:55:55 +0000 (13:55 +0000)]
Merge "Make zygotes aware of their supported ABIs."
Narayan Kamath [Wed, 9 Apr 2014 13:55:54 +0000 (13:55 +0000)]
Merge "Clean up argc / argv processing for runtime args."
Narayan Kamath [Mon, 7 Apr 2014 12:56:15 +0000 (13:56 +0100)]
Make zygotes aware of their supported ABIs.
Query system properties for the list of ABIs and pass
it as a command line argument to ZygoteInit.
Also add a new Zygote command that returns this list of
ABIs to peers.
Change-Id: I68034c6f63fa626911122579a011a0a25a8cda94
Narayan Kamath [Mon, 7 Apr 2014 11:44:58 +0000 (12:44 +0100)]
Clean up argc / argv processing for runtime args.
- Make copies of argc, argv before argv is potentially
overwritten with the process name.
- Allow multiple command line arguments to be passed to
ZygoteInit (this is required for some of the 64 bit
zygote work).
- Add an explanatory comment about how these argments
are processed.
Change-Id: I752be69c5c0f97ed17d1a3dded19f46ee00929b0
Narayan Kamath [Wed, 9 Apr 2014 11:33:20 +0000 (11:33 +0000)]
am
00cfbe82: am
a5608acb: Merge "Don\'t allow MemoryFiles of negative length."
* commit '
00cfbe82fa80ef57f3b1c34e47836d3e28c381b8':
Don't allow MemoryFiles of negative length.
Jeff Brown [Wed, 9 Apr 2014 09:12:40 +0000 (09:12 +0000)]
am
ea72cdf2: Merge "Move display power controller to display manager service. (DO NOT MERGE)" into klp-modular-dev
* commit '
ea72cdf22f8efde4d3b872a60587e4b26bc93e43':
Move display power controller to display manager service. (DO NOT MERGE)
Narayan Kamath [Wed, 9 Apr 2014 09:09:58 +0000 (09:09 +0000)]
am
a5608acb: Merge "Don\'t allow MemoryFiles of negative length."
* commit '
a5608acbd7647e0fd9aa87e5319715b0cbd6b0c0':
Don't allow MemoryFiles of negative length.
Narayan Kamath [Wed, 9 Apr 2014 09:07:29 +0000 (09:07 +0000)]
Merge "Don't allow MemoryFiles of negative length."
Jeff Brown [Wed, 9 Apr 2014 04:36:51 +0000 (04:36 +0000)]
Merge "Move certain internal activity manager methods to new class." into klp-modular-dev
Jeff Brown [Wed, 9 Apr 2014 04:33:27 +0000 (04:33 +0000)]
Merge "Move display power controller to display manager service. (DO NOT MERGE)" into klp-modular-dev
Jeff Brown [Tue, 8 Apr 2014 02:45:27 +0000 (19:45 -0700)]
Move certain internal activity manager methods to new class.
This is a little bit of refactoring in preparation for changing how
the power manager notifies system components about changes in power
state.
Deleted the startRunning method since it is no longer useful.
Bug:
13133142
Change-Id: I7f845c61ecc7ee890154ed0cbd90795de609b7ea
Jeff Brown [Wed, 9 Apr 2014 00:26:30 +0000 (17:26 -0700)]
Move display power controller to display manager service. (DO NOT MERGE)
This refactoring is in preparation for enabling the display manager
to have more control over the blanking state of individual displays.
There are no functional changes. Some bits will be cleaned up in
a subsequent patch.
Bug:
13133142
Change-Id: Ib811835e8757449c7899ac61807029baaf998161
Dave Platt [Thu, 13 Mar 2014 23:35:15 +0000 (23:35 +0000)]
Merge "NsdService does not clean up after exiting clients"
Mark Salyzyn [Tue, 8 Apr 2014 22:21:50 +0000 (15:21 -0700)]
jni: liblog reading error API incorrect
- return value contains -errno on error.
Bug:
13907124
Change-Id: I91f12db5749fac2ae8ed5b0f033d4eaf83e666f5
Adam Hampson [Tue, 8 Apr 2014 17:24:47 +0000 (10:24 -0700)]
resolved conflicts for merge of
bd6c5577 to klp-modular-dev-plus-aosp
Change-Id: I993d4baf89b3f414ac3ad313c74afe340c11f28f
Adam Hampson [Tue, 8 Apr 2014 15:51:22 +0000 (15:51 +0000)]
Merge "DO NOT MERGE Remove java.io.tmpdir assignment in AndroidRuntime." into klp-modular-dev
Narayan Kamath [Tue, 8 Apr 2014 15:10:52 +0000 (16:10 +0100)]
Don't allow MemoryFiles of negative length.
Prevents us from converting a (signed) jint into an
(unsigned) size_t and having horrible things happen.
Change-Id: I0f04e2eb9852ae7fc49b435fd0974f56e86751a4
Baligh Uddin [Tue, 8 Apr 2014 02:20:37 +0000 (02:20 +0000)]
am
0cf836a7: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev
* commit '
0cf836a77821afe8ff6cdfdaa3b55987cb6317da':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 8 Apr 2014 02:16:35 +0000 (02:16 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-modular-dev
Narayan Kamath [Fri, 14 Feb 2014 17:14:09 +0000 (17:14 +0000)]
DO NOT MERGE Remove java.io.tmpdir assignment in AndroidRuntime.
This value is overridden by the framework anyway
(see ActivityThread.handleBindApplication). Besides,
it doesn't seem like a great idea to let tools clutter
/sdcard/ with temp files.
(cherry picked from commit
b3802a8e2360aaa0a88faa625e15c31b56eaf125)
Bug:
13763685
Bug:
13763900
Change-Id: I26c710cbea7397f89e6103e54a73044a87da95b1
Craig Mautner [Mon, 7 Apr 2014 22:21:33 +0000 (22:21 +0000)]
am
228cefa8: am
3fb2b713: Merge "[ActivityManager] Reduce report ANR on wrong activity."
* commit '
228cefa83dd7b95e5581f619bb597808af726f80':
[ActivityManager] Reduce report ANR on wrong activity.
Craig Mautner [Mon, 7 Apr 2014 22:14:56 +0000 (22:14 +0000)]
am
3fb2b713: Merge "[ActivityManager] Reduce report ANR on wrong activity."
* commit '
3fb2b7132b64c65163e7c6cd948e45f703e93687':
[ActivityManager] Reduce report ANR on wrong activity.