OSDN Git Service

android-x86/frameworks-base.git
8 years agoMerge "aidl: Add end to end test"
Christopher Wiley [Wed, 2 Sep 2015 21:10:30 +0000 (21:10 +0000)]
Merge "aidl: Add end to end test"

8 years agoMerge "aidl: Remove example test"
Christopher Wiley [Wed, 2 Sep 2015 21:10:09 +0000 (21:10 +0000)]
Merge "aidl: Remove example test"

8 years agoMerge "Delete outdated options tests"
Casey Dahlin [Wed, 2 Sep 2015 21:02:02 +0000 (21:02 +0000)]
Merge "Delete outdated options tests"

8 years agoMerge "Remove RPC interface Type"
Casey Dahlin [Wed, 2 Sep 2015 21:01:33 +0000 (21:01 +0000)]
Merge "Remove RPC interface Type"

8 years agoDelete outdated options tests
Casey Dahlin [Wed, 2 Sep 2015 18:02:11 +0000 (11:02 -0700)]
Delete outdated options tests

Bug: 23718807
Test: Re-ran make. Confirmed code was not linked.
Change-Id: If065b9287ed70b9e380281cae42f89bd5f1ffb06
Signed-off-by: Casey Dahlin <sadmac@google.com>
8 years agoRemove RPC interface Type
Casey Dahlin [Tue, 1 Sep 2015 20:21:26 +0000 (13:21 -0700)]
Remove RPC interface Type

AIDL previously supported "rpc" and "flatten" types, which are not used
anywhere in the Android tree. This patch removes them, which significantly cuts
down code and complexity.

Bug: 23517584
Test: Rebuilt AOSP tree against new version
Change-Id: I6cf38d43c1ce109ffca987cc14520945aa22431f
Signed-off-by: Casey Dahlin <sadmac@google.com>
8 years agoaidl: Add end to end test
Christopher Wiley [Tue, 1 Sep 2015 00:36:41 +0000 (17:36 -0700)]
aidl: Add end to end test

This test sets up an artificial hierarchy of .aidl files, then
checks that the generated code contains a substring that we
know to be correct.  This isn't a very good unittest, but it does
validate that the whole flow works start to finish.

Bug: 23516947
Test: compiles, unit tests pass.

Change-Id: I931b7659731b05440040623e12596669604cef3a

8 years agoaidl: Remove example test
Christopher Wiley [Wed, 2 Sep 2015 19:49:52 +0000 (12:49 -0700)]
aidl: Remove example test

We have enough tests demonstrating how to write them.

Bug: 23516947
Change-Id: I966cb6bb2d754db389be8f9b90957ac33cf66639
Test: Unittests pass.

8 years agoMerge "aidl: Don't link librt on Mac"
Christopher Wiley [Wed, 2 Sep 2015 16:23:01 +0000 (16:23 +0000)]
Merge "aidl: Don't link librt on Mac"

8 years agoaidl: Don't link librt on Mac
Christopher Wiley [Wed, 2 Sep 2015 01:36:44 +0000 (18:36 -0700)]
aidl: Don't link librt on Mac

This fixes unittest build on Mac.

Change-Id: I5180f647d1b5b41f99c4d0423aaec9d05fee6355

8 years agoMerge "Add trace code to system server."
Yasuhiro Matsuda [Wed, 2 Sep 2015 12:54:23 +0000 (12:54 +0000)]
Merge "Add trace code to system server."

8 years agoMerge "aidl: Stop using Bionic's test main"
Christopher Wiley [Tue, 1 Sep 2015 19:46:21 +0000 (19:46 +0000)]
Merge "aidl: Stop using Bionic's test main"

8 years agoaidl: Stop using Bionic's test main
Christopher Wiley [Tue, 1 Sep 2015 19:39:25 +0000 (12:39 -0700)]
aidl: Stop using Bionic's test main

This allows us to build unittests on Mac, where Bionic's test main
does not build.

Change-Id: I59c805d233498bb67575f2e5f7049341f70ce55c

8 years agoMerge "aidl: Separate aidl logic into its own static library"
Christopher Wiley [Tue, 1 Sep 2015 18:34:32 +0000 (18:34 +0000)]
Merge "aidl: Separate aidl logic into its own static library"

8 years agoaidl: Separate aidl logic into its own static library
Christopher Wiley [Tue, 1 Sep 2015 18:07:48 +0000 (11:07 -0700)]
aidl: Separate aidl logic into its own static library

Compile aidl's logic into a static library that can be
linked against both the unittest binary and the executable. Validate
that this is working by writing a basic unittest against options
parsing.

Provide default values for Options struct members.  These were
previously taking on values according to the the bits in the memory
allocated to hold them for preprocessed inputs.

Bug: 23516947
Change-Id: Ib57cd7f473995f7851d788deac39f9c4d9018e8f
Test: compiles and unittests pass

8 years agoMerge "Set up aidl for gtest"
Christopher Wiley [Tue, 1 Sep 2015 18:11:41 +0000 (18:11 +0000)]
Merge "Set up aidl for gtest"

8 years agoMerge "Automatically assign default seinfo labels using the string "default"."
Nick Kralevich [Tue, 1 Sep 2015 13:39:10 +0000 (13:39 +0000)]
Merge "Automatically assign default seinfo labels using the string "default"."

8 years agoAutomatically assign default seinfo labels using the string "default".
Robert Craig [Fri, 28 Aug 2015 16:11:41 +0000 (12:11 -0400)]
Automatically assign default seinfo labels using the string "default".

default seinfo values are those for which policy lacks a
matching stanza in the corresponding mac_permissions.xml
file. Prior to this change the null object reference was
used to represent the non-matching state. This is in
contrast to a policy supplied default stanza which will
assign a non null seinfo value. Confused yet?

Basically, two default states were distinguished in the
code to describe the two cases where either a policy stanza
spelled out the base case seinfo label or not. Policy
writers could either supply a default stanza or rely on
the class instantiated value assigned by the ApplicationInfo
object. The hope was that the later assignment could be
used to help distinguish the cases where policy writers
intentionally white listed apps. This change will just use
the hard coded "default" string implicitly to describe all
cases and removes the idea of a policy supplied default stanza.

Change-Id: Ib7b01ee004775f24db9a69340a31784b967ce030
Signed-off-by: rpcraig <rpcraig@tycho.ncsc.mil>
8 years agoMerge "Tighten up compiler flags for aidl"
Christopher Wiley [Mon, 31 Aug 2015 20:59:23 +0000 (20:59 +0000)]
Merge "Tighten up compiler flags for aidl"

8 years agoTighten up compiler flags for aidl
Christopher Wiley [Mon, 24 Aug 2015 22:06:58 +0000 (15:06 -0700)]
Tighten up compiler flags for aidl

Turn all warnings to errors, with special cases for places where
yacc forces us to be lenient.  Remove one variable with 0 references
elsewhere in the code.

These flags are confined to be clang only because the Windows SDK build
is using an older compiler that does not understand these flags.

Change-Id: I6407bd331c25b8845bde46e9a917bce1d6857bd8

8 years agoMerge "Remove USE_MINGW, whitelist windows modules"
Dan Willemsen [Mon, 31 Aug 2015 19:30:57 +0000 (19:30 +0000)]
Merge "Remove USE_MINGW, whitelist windows modules"

8 years agoMerge "Revert "Tighten up compiler flags for aidl""
Christopher Wiley [Mon, 31 Aug 2015 19:13:04 +0000 (19:13 +0000)]
Merge "Revert "Tighten up compiler flags for aidl""

8 years agoRevert "Tighten up compiler flags for aidl"
Christopher Wiley [Mon, 31 Aug 2015 19:07:40 +0000 (19:07 +0000)]
Revert "Tighten up compiler flags for aidl"

This reverts commit eea2353a3427f7d157c46e24ab6aba1378e16c2e.

This seems to have broken the build because whatever compiler the builder is using doesn't understand the same "turn off this warning" flags as my local host's compiler.

Change-Id: Ic68b7065b161a5ae683b7082c67147835833e0fa

8 years agoMerge "aidl: Pull main() into dedicated file"
Christopher Wiley [Mon, 31 Aug 2015 19:03:44 +0000 (19:03 +0000)]
Merge "aidl: Pull main() into dedicated file"

8 years agoaidl: Pull main() into dedicated file
Christopher Wiley [Sun, 30 Aug 2015 17:57:07 +0000 (10:57 -0700)]
aidl: Pull main() into dedicated file

This separates the main() entry point from the functionality we're
hoping to test.  While here, redo the header guards to be consistent
accross the codebae.

Bug: 23516947
Change-Id: I61666126bdba0941f14bd0f031caaa30367b864a
Test: Compiles

8 years agoMerge "Tighten up compiler flags for aidl"
Christopher Wiley [Mon, 31 Aug 2015 17:52:03 +0000 (17:52 +0000)]
Merge "Tighten up compiler flags for aidl"

8 years agoTighten up compiler flags for aidl
Christopher Wiley [Mon, 24 Aug 2015 22:06:58 +0000 (15:06 -0700)]
Tighten up compiler flags for aidl

Turn all warnings to errors, with special cases for places where
yacc forces us to be lenient.  Remove one variable with 0 references
elsewhere in the code.

Change-Id: Ia7819795eb162e9c77d215088aee4c45bd87c1af

8 years agoSet up aidl for gtest
Casey Dahlin [Fri, 28 Aug 2015 22:46:48 +0000 (15:46 -0700)]
Set up aidl for gtest

Bug: 23516947

Change-Id: I1c004868525f462d04894a7b96c671b626061ab5
Signed-off-by: Casey Dahlin <sadmac@google.com>
8 years agoMerge "Do not merge namespaces"
Christopher Wiley [Fri, 28 Aug 2015 23:09:50 +0000 (23:09 +0000)]
Merge "Do not merge namespaces"

8 years agoRemove USE_MINGW, whitelist windows modules
Dan Willemsen [Wed, 19 Aug 2015 18:13:56 +0000 (11:13 -0700)]
Remove USE_MINGW, whitelist windows modules

Bug: 23566667
Change-Id: Ie6b8c51e2b6d6273f99f4e361c440136d7c6915c

8 years agoAdd trace code to system server.
Yasuhiro Matsuda [Tue, 30 Jun 2015 08:07:32 +0000 (17:07 +0900)]
Add trace code to system server.

- Add TRACE_TAG_SYSTEM_SERVER for tracing system server code.
- Add a few more tracing code to the code paths related to boot.

BUG: 21739901
BUG: 22207144
Change-Id: I08b424d2f83783f512c3818394099909cd55f327

8 years agoMerge "Fix WallpaperCropper crash when setting wallpaper over 8MB"
Alan Viverette [Wed, 26 Aug 2015 14:20:43 +0000 (14:20 +0000)]
Merge "Fix WallpaperCropper crash when setting wallpaper over 8MB"

8 years agoFix WallpaperCropper crash when setting wallpaper over 8MB
Stephen Woo [Mon, 6 Jul 2015 21:35:14 +0000 (14:35 -0700)]
Fix WallpaperCropper crash when setting wallpaper over 8MB

Use large heap for WallpaperCropper to avoid OOM crash in
createBitmap().

Change-Id: I1dc171286eaf0da37323ccf9fab046ca17e2ff07
Signed-off-by: Stephen Woo <stephen.m.woo@intel.com>
Signed-off-by: Dan Liang <dan.liang@intel.com>
8 years agoDo not merge namespaces
Christopher Wiley [Mon, 24 Aug 2015 21:07:32 +0000 (14:07 -0700)]
Do not merge namespaces

It is good practice to not include the whole std:: namespace into
the global namespace.  This is doubly true in headers.

TEST=aidl compiles

Change-Id: I910ca8082f61cce4f23f8564b8a12c2828b75b3c

8 years agoMerge "Don't make bad RS API level recommendations."
Stephen Hines [Fri, 21 Aug 2015 21:57:37 +0000 (21:57 +0000)]
Merge "Don't make bad RS API level recommendations."

8 years agoMerge "bundle init.rc contents with its service"
Tom Cherry [Fri, 21 Aug 2015 17:42:30 +0000 (17:42 +0000)]
Merge "bundle init.rc contents with its service"

8 years agoMerge "wm: call displayReady for all built in displays when system is ready."
Chong Zhang [Thu, 20 Aug 2015 19:48:31 +0000 (19:48 +0000)]
Merge "wm: call displayReady for all built in displays when system is ready."

8 years agoMerge "zygote: fix memory leak when fork process"
Elliott Hughes [Thu, 20 Aug 2015 01:14:00 +0000 (01:14 +0000)]
Merge "zygote: fix memory leak when fork process"

8 years agobundle init.rc contents with its service
Tom Cherry [Fri, 14 Aug 2015 20:01:13 +0000 (13:01 -0700)]
bundle init.rc contents with its service

Bug: 23186545
Change-Id: I080e73d6a124873c2ddd0fba85315d7082faf3f5

8 years agozygote: fix memory leak when fork process
Mykola Kondratenko [Fri, 31 Jul 2015 15:22:26 +0000 (17:22 +0200)]
zygote: fix memory leak when fork process

Release memory allocated by GetIntArrayElements.

Change-Id: If7ce2a78a480e58b0376352ce438dbe51f664f3a

8 years agoDon't make bad RS API level recommendations.
Stephen Hines [Wed, 19 Aug 2015 00:41:41 +0000 (17:41 -0700)]
Don't make bad RS API level recommendations.

This document was recommending that users always target the latest
available API level, but that will prevent optimization on older
devices. Instead, they should be setting the minimum value that they
require.

Change-Id: I27c65872d124ed0beaeb2125d68d1d636ffa9352

8 years agoMerge "Recursively delete directories in handleAftermath()."
Tao Bao [Tue, 18 Aug 2015 22:26:16 +0000 (22:26 +0000)]
Merge "Recursively delete directories in handleAftermath()."

8 years agoRecursively delete directories in handleAftermath().
Tao Bao [Tue, 18 Aug 2015 19:37:02 +0000 (12:37 -0700)]
Recursively delete directories in handleAftermath().

RecoverySystem.handleAftermath() is called to clean up recovery-related
files. It needs to handle non-empty directories as well such as leftover
stashes from failed OTAs.

Bug: 23199081
Change-Id: I33fb326d376d04c793ad7b5948a10e8c1c572812

8 years agoMerge "Replace HAVE_MS_C_RUNTIME with _WIN32 in frameworks/base/tools."
Elliott Hughes [Mon, 17 Aug 2015 20:51:00 +0000 (20:51 +0000)]
Merge "Replace HAVE_MS_C_RUNTIME with _WIN32 in frameworks/base/tools."

8 years agoReplace HAVE_MS_C_RUNTIME with _WIN32 in frameworks/base/tools.
Elliott Hughes [Mon, 17 Aug 2015 19:41:46 +0000 (12:41 -0700)]
Replace HAVE_MS_C_RUNTIME with _WIN32 in frameworks/base/tools.

Change-Id: Ideef62acbf53a442167c9b8038021affffef9e8a

8 years agoMerge "Make the value for shadowRadius less than 1.0 work"
Chris Craik [Fri, 14 Aug 2015 22:02:19 +0000 (22:02 +0000)]
Merge "Make the value for shadowRadius less than 1.0 work"

8 years agoMerge "Fix mismatched new[]/delete."
Dan Albert [Fri, 14 Aug 2015 21:23:29 +0000 (21:23 +0000)]
Merge "Fix mismatched new[]/delete."

8 years agoFix mismatched new[]/delete.
Dan Albert [Fri, 14 Aug 2015 21:12:29 +0000 (14:12 -0700)]
Fix mismatched new[]/delete.

The new clang will emit a warning for this.

Change-Id: Ie0edc46461eb5edb2a7ad33a3a7f6cef2d825c36

8 years agoMerge "SELinuxPolicyInstallReceiver: Switch to file_contexts.bin."
Nick Kralevich [Wed, 12 Aug 2015 23:46:28 +0000 (23:46 +0000)]
Merge "SELinuxPolicyInstallReceiver:  Switch to file_contexts.bin."

8 years agoMerge "Lose HAVE_ANDROID_OS from frameworks/base."
Elliott Hughes [Wed, 12 Aug 2015 22:21:46 +0000 (22:21 +0000)]
Merge "Lose HAVE_ANDROID_OS from frameworks/base."

8 years agoLose HAVE_ANDROID_OS from frameworks/base.
Elliott Hughes [Wed, 12 Aug 2015 21:49:53 +0000 (14:49 -0700)]
Lose HAVE_ANDROID_OS from frameworks/base.

Change-Id: I713881fdbaec7cbbb5e7f2f4be6f9b8be3d2ca4e

8 years agoMerge "Add ICU as a java library for docs."
Neil Fuller [Fri, 7 Aug 2015 14:46:06 +0000 (14:46 +0000)]
Merge "Add ICU as a java library for docs."

8 years agoMerge "Clean up AssetManager::scanAndMergeZipLocked"
Yusuke Sato [Wed, 5 Aug 2015 22:15:50 +0000 (22:15 +0000)]
Merge "Clean up AssetManager::scanAndMergeZipLocked"

8 years agoMerge "Let findSupportedAbi and hasRenderscriptBitcode scan only relevant files"
Yusuke Sato [Wed, 5 Aug 2015 17:46:18 +0000 (17:46 +0000)]
Merge "Let findSupportedAbi and hasRenderscriptBitcode scan only relevant files"

8 years agoSELinuxPolicyInstallReceiver: Switch to file_contexts.bin.
Stephen Smalley [Wed, 5 Aug 2015 17:40:49 +0000 (13:40 -0400)]
SELinuxPolicyInstallReceiver:  Switch to file_contexts.bin.

Switch to file_contexts.bin.

Change-Id: I745a98c324075b42d8f20cf6cf36568896476f3e
Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
8 years agoMerge "animateNoDamage failed to remove from current frame list"
John Reck [Tue, 4 Aug 2015 20:52:40 +0000 (20:52 +0000)]
Merge "animateNoDamage failed to remove from current frame list"

8 years agoMerge "hwui: add extension to support unpack operations in OpenGL ES 2.0"
John Reck [Tue, 4 Aug 2015 19:55:53 +0000 (19:55 +0000)]
Merge "hwui: add extension to support unpack operations in OpenGL ES 2.0"

8 years agoMerge "Fix NPE in JobStore when jobs.xml is empty."
Matthew Williams [Tue, 4 Aug 2015 17:39:51 +0000 (17:39 +0000)]
Merge "Fix NPE in JobStore when jobs.xml is empty."

8 years agoanimateNoDamage failed to remove from current frame list
Ye Ouyang [Tue, 4 Aug 2015 15:40:57 +0000 (10:40 -0500)]
animateNoDamage failed to remove from current frame list

runRemainingAnimations is used to animate the available animation handle
which were not yet run, it actually animate those animation handle and
removes from the list by notifyAnimationsRan(). In case if these animation
handles are not removed, it leads to the Fatal Assert of runRemainingAnimations.

Some usecases causes the addition of animation handle when there is
no animators, in these cases this check prevents execution of
notifyAnimationsRan() leads to Fatal Assert crash of runRemainingAnimations.

Allowing the animation to happen irrespective of animators solves the problem.

Change-Id: Ifa72286cdc6ff785fcc999f3b951dd787e7003e9

8 years agohwui: add extension to support unpack operations in OpenGL ES 2.0
xiaozhengdong [Tue, 4 Aug 2015 08:55:35 +0000 (16:55 +0800)]
hwui: add extension to support unpack operations in OpenGL ES 2.0

OpenGL ES 3.0+ lets us specify the row length for unpack operations
such as glTexSubImage2D(). This allows us to upload a sub-rectangle
of a texture. Also, the GL_EXT_unpack_subimage extension can also
support this feature in OpenGL ES 2.0

Change-Id: Id43c2c55c5eaefbace67087c955f0b4324fb2c35
Signed-off-by: xiaozhengdong <xiaozhengdong@xiaomi.com>
8 years agoClean up AssetManager::scanAndMergeZipLocked
Yusuke Sato [Mon, 3 Aug 2015 23:21:10 +0000 (16:21 -0700)]
Clean up AssetManager::scanAndMergeZipLocked

Now that ZipFileRO::startIteration supports prefix/suffix matching,
we can pass dirName to the function for simpler code and slightly
better performance.

(cherry-pick of c796ad0a8be6df4a3b354690dfe5ce1df8136c09)

Change-Id: I0e2ac58de28020c2af8d8e569a97592b09596185

8 years agoLet findSupportedAbi and hasRenderscriptBitcode scan only relevant files
Yusuke Sato [Mon, 3 Aug 2015 23:17:16 +0000 (16:17 -0700)]
Let findSupportedAbi and hasRenderscriptBitcode scan only relevant files

for better performance. Without the optimization, these two functions
may check more than 100k file names in the pre-installed APK files,
which can take a few seconds to finish even on a recent device.

(cherry-pick of 34fe3df8519523dbb4bc27010fa57f259d5e868d)

Bug: 21957428
Change-Id: I5ebe0438019958d883a7fda6bd92ea4484211d23

8 years agoMerge "Idle Job Start During SCREEN_ON or DREAMING_STOPPED"
Matthew Williams [Mon, 3 Aug 2015 23:58:48 +0000 (23:58 +0000)]
Merge "Idle Job Start During SCREEN_ON or DREAMING_STOPPED"

8 years agoMerge "Add a trace constant for PackageManager"
Todd Kennedy [Mon, 3 Aug 2015 17:44:45 +0000 (17:44 +0000)]
Merge "Add a trace constant for PackageManager"

8 years agoAdd a trace constant for PackageManager
Todd Kennedy [Mon, 3 Aug 2015 16:56:07 +0000 (09:56 -0700)]
Add a trace constant for PackageManager

Change-Id: Ida391be765c63d7b6da3d9fd9d1d975e51b4f3e7

8 years agoAdd ICU as a java library for docs.
Rayhaan Jaufeerally [Mon, 3 Aug 2015 12:54:28 +0000 (13:54 +0100)]
Add ICU as a java library for docs.

Change-Id: Ifd5f0a076e2cbdf0498c209c916d5a55aa12f0ce

8 years agoIdle Job Start During SCREEN_ON or DREAMING_STOPPED
Kevin Zhu [Mon, 29 Jun 2015 23:06:49 +0000 (16:06 -0700)]
Idle Job Start During SCREEN_ON or DREAMING_STOPPED

When the screen goes off or dreaming start, an alarm will be
scheduled and idle state will be true when the alarm expired.
If the screen goes on or dreaming stop happens before
the alarm expired, the alarm isn't cancelled and idle state is
set to be true when the device is in SCREEN_ON or DREADING_STOPPED
state. There is also a case that Idle alarm triggered when
the screen on or dreaming stop just start to be processed.
ACTION_TRIGGER_IDLE will set mIdle to true during screen on
or dreaming stop.

In this patch, the alarm will be cancelled when the screen goes
on or dreaming stop and screen-on flag will be set. So the idle
state can only be set when screen is off or dreaming started.

Change-Id: I06ae4b7fd77901f9570ce0459d2299bbfd4b46b4

8 years agoMerge "Distinguish user-requested shutdown from power-related ones"
Yusuke Sato [Fri, 31 Jul 2015 23:13:16 +0000 (23:13 +0000)]
Merge "Distinguish user-requested shutdown from power-related ones"

9 years agoDistinguish user-requested shutdown from power-related ones
Yusuke Sato [Tue, 21 Jul 2015 22:52:11 +0000 (15:52 -0700)]
Distinguish user-requested shutdown from power-related ones

With this patch, when the user requested shutdown,
PowerManagerService sets sys.powerctl is set to
"shutdown,userrequested", and init runs fsck on shutdown.

When shutdown is triggered due to a low power state etc.,
the service sets the property to "shutdown,", and init
immediately shuts down the system without running the
command.

This is a follow-up CL for http://r.android.com/158525.

Bug: 21853106
Change-Id: Iae72990130fe9aa479c802f77301438190dbbfb3

9 years agoMerge "Use _WIN32 rather than HAVE_WINSOCK."
Elliott Hughes [Thu, 30 Jul 2015 15:19:09 +0000 (15:19 +0000)]
Merge "Use _WIN32 rather than HAVE_WINSOCK."

9 years agoFix NPE in JobStore when jobs.xml is empty.
riddle_hsu [Thu, 30 Jul 2015 13:52:58 +0000 (21:52 +0800)]
Fix NPE in JobStore when jobs.xml is empty.

It is possible that jobs.xml does not have valid content
if the device meet unexpected power off or reboot during
writing the file, then parser.getName() may get null string
on next boot.

Because log does not allow to print null message.
It will result boot fail:
Caused by: java.lang.NullPointerException: println needs a message
 at android.util.Log.println_native(Native Method)
 at android.util.Slog.d
 at com.android.server.job.JobStore
    $ReadJobMapFromDiskRunnable.readJobMapImpl

Change-Id: Icd485096e2f00f4028428a9ad95cd0ef66b2dca0

9 years agoUse _WIN32 rather than HAVE_WINSOCK.
Elliott Hughes [Thu, 30 Jul 2015 00:49:27 +0000 (17:49 -0700)]
Use _WIN32 rather than HAVE_WINSOCK.

Change-Id: I0821d2af8473c359e8b73aec455000cb7c42f690

9 years agoMerge "Move frameworks/base/tools/ off AndroidConfig.h."
Elliott Hughes [Wed, 29 Jul 2015 23:13:54 +0000 (23:13 +0000)]
Merge "Move frameworks/base/tools/ off AndroidConfig.h."

9 years agoMove frameworks/base/tools/ off AndroidConfig.h.
Elliott Hughes [Wed, 29 Jul 2015 21:35:18 +0000 (14:35 -0700)]
Move frameworks/base/tools/ off AndroidConfig.h.

Change-Id: Ibc7abb67a56945a9618bc91ccdbebe4c806879a5

9 years agoMerge "Use _WIN32 rather than HAVE_WINDOWS_PATHS."
Elliott Hughes [Wed, 29 Jul 2015 15:47:46 +0000 (15:47 +0000)]
Merge "Use _WIN32 rather than HAVE_WINDOWS_PATHS."

9 years agoUse _WIN32 rather than HAVE_WINDOWS_PATHS.
Elliott Hughes [Wed, 29 Jul 2015 15:44:17 +0000 (08:44 -0700)]
Use _WIN32 rather than HAVE_WINDOWS_PATHS.

Change-Id: Ib1ae71dfbb20e3e5309ed737f48382cc42d2583f

9 years agoMerge "ActivityManagerService: delete unnecessary mkdir"
Nick Kralevich [Sun, 26 Jul 2015 04:25:56 +0000 (04:25 +0000)]
Merge "ActivityManagerService: delete unnecessary mkdir"

9 years agoActivityManagerService: delete unnecessary mkdir
Nick Kralevich [Sun, 26 Jul 2015 04:12:09 +0000 (21:12 -0700)]
ActivityManagerService: delete unnecessary mkdir

/data/anr is now created in init.rc. This code is unnecessary.

Bug: 22385254
Change-Id: Ide6c9749c27668523f9316049a1d40d961f2276d

9 years agoMerge "Frameworks/base: Hand fingerprint to ART"
Andreas Gampe [Fri, 24 Jul 2015 22:38:28 +0000 (22:38 +0000)]
Merge "Frameworks/base: Hand fingerprint to ART"

9 years agoFrameworks/base: Hand fingerprint to ART
Andreas Gampe [Fri, 24 Jul 2015 21:19:44 +0000 (14:19 -0700)]
Frameworks/base: Hand fingerprint to ART

To allow ANR dumps to be symbolized easily, hand the build
fingerprint to the runtime.

Bug: 22693991

(cherry picked from commit e60825033fdde9eefaeec768a28b907e2d22f10c)

Change-Id: Ibd3d3b3bd65dce84acfb97a487807d6f280a9508

9 years agoMerge "Add phony source target in the generated dependency file of aidl."
Ying Wang [Fri, 24 Jul 2015 00:38:08 +0000 (00:38 +0000)]
Merge "Add phony source target in the generated dependency file of aidl."

9 years agoMerge "RenderScript: implement a Script entry point for calling a reduce-style kernel."
Stephen Hines [Thu, 23 Jul 2015 22:26:05 +0000 (22:26 +0000)]
Merge "RenderScript: implement a Script entry point for calling a reduce-style kernel."

9 years agoMerge "Use build_number from file"
Colin Cross [Thu, 23 Jul 2015 18:23:06 +0000 (18:23 +0000)]
Merge "Use build_number from file"

9 years agoAdd phony source target in the generated dependency file of aidl.
Ying Wang [Thu, 23 Jul 2015 00:42:35 +0000 (17:42 -0700)]
Add phony source target in the generated dependency file of aidl.

This fixes make error when the source .aidl file is moved around but
its path relative to LOCAL_PATH doesn't change.

Bug: 22666539
Change-Id: Idf2492145e4927779d184932a09d61e4fe8ded0f

9 years agoMerge "aapt: expat exports its header files now."
Elliott Hughes [Wed, 22 Jul 2015 01:00:11 +0000 (01:00 +0000)]
Merge "aapt: expat exports its header files now."

9 years agoaapt: expat exports its header files now.
Elliott Hughes [Tue, 21 Jul 2015 18:39:21 +0000 (11:39 -0700)]
aapt: expat exports its header files now.

(cherrypick of 51348d2007b801c7bd7350f72e2300f1a5a41dd1)
Change-Id: Iddf0133919d38fc896f97c6796f8228a6decf174

9 years agoUse build_number from file
Colin Cross [Fri, 17 Jul 2015 00:55:31 +0000 (17:55 -0700)]
Use build_number from file

Improve incremental ninja builds by keeping the command line the same
across builds.

Change-Id: If9dfcee74a4d282c183f9669e14a89104c115a71

9 years agoRenderScript: implement a Script entry point for calling a
Matt Wala [Mon, 20 Jul 2015 22:35:27 +0000 (15:35 -0700)]
RenderScript: implement a Script entry point for calling a
reduce-style kernel.

Bug: 22631253

This adds a new (currently hidden) API to the Script class and the
corresponding code for the RenderScript JNI layer.

Change-Id: I40f19aaeb90411b859bd6b0bffc3f071fa327c21

9 years agoMerge "[RenderScript] Add docs advising users about dstAtop bug."
Miao Wang [Mon, 20 Jul 2015 23:57:19 +0000 (23:57 +0000)]
Merge "[RenderScript] Add docs advising users about dstAtop bug."

9 years ago[RenderScript] Add docs advising users about dstAtop bug.
Miao Wang [Mon, 20 Jul 2015 22:05:31 +0000 (15:05 -0700)]
[RenderScript] Add docs advising users about dstAtop bug.

Bug: 22047392
Change-Id: I736a697276020687c20dff515aabb1be1776f8c0
(cherry picked from commit ffb1a9bed0788d3547f085bfb9d254004e0db1e3)

9 years agoMerge "Add a flag to the API to specify -O0 on the bcc command line."
Stephen Hines [Fri, 17 Jul 2015 22:45:15 +0000 (22:45 +0000)]
Merge "Add a flag to the API to specify -O0 on the bcc command line."

9 years agoMerge "Migrate Resources.java to use ICU4j drectly."
Neil Fuller [Fri, 17 Jul 2015 10:09:23 +0000 (10:09 +0000)]
Merge "Migrate Resources.java to use ICU4j drectly."

9 years agoAdd a flag to the API to specify -O0 on the bcc command line.
verena beckham [Fri, 22 May 2015 15:47:53 +0000 (16:47 +0100)]
Add a flag to the API to specify -O0 on the bcc command line.

Add a flag CREATE_FLAG_OPT_LEVEL_0 to set the optimization level to 0 when calling bcc.
This will result in an object file that is easier to debug.

Change-Id: I0384dca098fa0d9ae0f2e02e798da9de342c1122
Signed-off-by: verena beckham <verena@codeplay.com>
9 years agowm: call displayReady for all built in displays when system is ready.
Vinu Deokaran [Tue, 16 Dec 2014 15:52:52 +0000 (10:52 -0500)]
wm: call displayReady for all built in displays when system is ready.

When system has more than one built in display, displayReady needs
to be called for all built in displays when window manager is ready.
Otherwise, some system services, such as presentation, mediarouter,
etc, won't work on these displays.

Change-Id: Ibf08074eff555c14a318236bd06e7b4855503140

9 years agoMerge "fix BNNM docs"
Miao Wang [Thu, 16 Jul 2015 18:00:01 +0000 (18:00 +0000)]
Merge "fix BNNM docs"

9 years agofix BNNM docs
Miao Wang [Wed, 15 Jul 2015 18:35:28 +0000 (11:35 -0700)]
fix BNNM docs

bug: 22507076
Change-Id: I5fdffdde597d97b1dde77574d096b81bff4aa382
(cherry picked from commit d7d413ad0bfaea2d4bb4adcd8011239c2f5f74ae)

9 years agoMerge "Fix NativeCrashListener"
Neil Fuller [Thu, 16 Jul 2015 10:26:17 +0000 (10:26 +0000)]
Merge "Fix NativeCrashListener"

9 years agoMerge "docs: Add an explicit dependency on libcore/Docs.mk"
Narayan Kamath [Thu, 16 Jul 2015 08:57:17 +0000 (08:57 +0000)]
Merge "docs: Add an explicit dependency on libcore/Docs.mk"

9 years agodocs: Add an explicit dependency on libcore/Docs.mk
Narayan Kamath [Tue, 14 Jul 2015 12:39:23 +0000 (13:39 +0100)]
docs: Add an explicit dependency on libcore/Docs.mk

We include libcore sources in apicheck / docs targets so we must
regenerate the stubs or api definitions whenever the list of libcore
sources changes.

Change-Id: I9383015069bc4064d5d06d3d540047cd408e24c7

9 years agoMerge "Fix a bug disappearing installerPackageName info of packages after reboot."
Chris Tate [Thu, 16 Jul 2015 00:09:37 +0000 (00:09 +0000)]
Merge "Fix a bug disappearing installerPackageName info of packages after reboot."