175216 Commits

Author SHA1 Message Date
Yusuke Sato
05f648e1d3 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
2015-08-03 17:24:42 -07:00
Yusuke Sato
957c23775f 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
2015-08-03 17:24:32 -07:00
Matthew Williams
608ad1409d Merge "Idle Job Start During SCREEN_ON or DREAMING_STOPPED" 2015-08-03 23:58:48 +00:00
Todd Kennedy
40f0efe03d Merge "Add a trace constant for PackageManager" 2015-08-03 17:44:45 +00:00
Todd Kennedy
114beb21a0 Add a trace constant for PackageManager
Change-Id: Ida391be765c63d7b6da3d9fd9d1d975e51b4f3e7
2015-08-03 09:56:07 -07:00
Kevin Zhu
ccfe87356f 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
2015-08-02 22:10:25 -07:00
Yusuke Sato
158560ad66 Merge "Distinguish user-requested shutdown from power-related ones" 2015-07-31 23:13:16 +00:00
Yusuke Sato
705ffd1efe 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
2015-07-30 23:47:13 -07:00
Elliott Hughes
f8a6a2f602 Merge "Use _WIN32 rather than HAVE_WINSOCK." 2015-07-30 15:19:09 +00:00
Elliott Hughes
59cbe8d107 Use _WIN32 rather than HAVE_WINSOCK.
Change-Id: I0821d2af8473c359e8b73aec455000cb7c42f690
2015-07-29 17:49:27 -07:00
Elliott Hughes
84a04d52e7 Merge "Move frameworks/base/tools/ off AndroidConfig.h." 2015-07-29 23:13:54 +00:00
Elliott Hughes
9ec96f9756 Move frameworks/base/tools/ off AndroidConfig.h.
Change-Id: Ibc7abb67a56945a9618bc91ccdbebe4c806879a5
2015-07-29 14:35:18 -07:00
Elliott Hughes
7d71d88c6d Merge "Use _WIN32 rather than HAVE_WINDOWS_PATHS." 2015-07-29 15:47:46 +00:00
Elliott Hughes
98c11b511a Use _WIN32 rather than HAVE_WINDOWS_PATHS.
Change-Id: Ib1ae71dfbb20e3e5309ed737f48382cc42d2583f
2015-07-29 08:44:17 -07:00
Nick Kralevich
e942b4596a Merge "ActivityManagerService: delete unnecessary mkdir" 2015-07-26 04:25:56 +00:00
Nick Kralevich
bd6b7e0973 ActivityManagerService: delete unnecessary mkdir
/data/anr is now created in init.rc. This code is unnecessary.

Bug: 22385254
Change-Id: Ide6c9749c27668523f9316049a1d40d961f2276d
2015-07-25 21:17:43 -07:00
Andreas Gampe
c0999f7877 Merge "Frameworks/base: Hand fingerprint to ART" 2015-07-24 22:38:28 +00:00
Andreas Gampe
1f105a6b27 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
2015-07-24 15:37:39 -07:00
Ying Wang
430c8c3e48 Merge "Add phony source target in the generated dependency file of aidl." 2015-07-24 00:38:08 +00:00
Stephen Hines
6430812a93 Merge "RenderScript: implement a Script entry point for calling a reduce-style kernel." 2015-07-23 22:26:05 +00:00
Colin Cross
01efd7e820 Merge "Use build_number from file" 2015-07-23 18:23:06 +00:00
Ying Wang
50fb02da53 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
2015-07-22 17:49:56 -07:00
Elliott Hughes
86d5fc2874 Merge "aapt: expat exports its header files now." 2015-07-22 01:00:11 +00:00
Elliott Hughes
b48adad2ed aapt: expat exports its header files now.
(cherrypick of 51348d2007b801c7bd7350f72e2300f1a5a41dd1)
Change-Id: Iddf0133919d38fc896f97c6796f8228a6decf174
2015-07-21 17:25:01 -07:00
Colin Cross
06e04f7671 Use build_number from file
Improve incremental ninja builds by keeping the command line the same
across builds.

Change-Id: If9dfcee74a4d282c183f9669e14a89104c115a71
2015-07-21 12:55:13 -07:00
Matt Wala
36eb1f74b3 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
2015-07-21 11:07:10 -07:00
Miao Wang
37353dc13e Merge "[RenderScript] Add docs advising users about dstAtop bug." 2015-07-20 23:57:19 +00:00
Miao Wang
37e1d0ce1e [RenderScript] Add docs advising users about dstAtop bug.
Bug: 22047392
Change-Id: I736a697276020687c20dff515aabb1be1776f8c0
(cherry picked from commit ffb1a9bed0788d3547f085bfb9d254004e0db1e3)
2015-07-20 16:44:14 -07:00
Stephen Hines
79a1bde2e0 Merge "Add a flag to the API to specify -O0 on the bcc command line." 2015-07-17 22:45:16 +00:00
Neil Fuller
7ce3847d75 Merge "Migrate Resources.java to use ICU4j drectly." 2015-07-17 10:09:25 +00:00
verena beckham
c9659ea3a2 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>
2015-07-16 19:45:09 -07:00
Miao Wang
10653cef2a Merge "fix BNNM docs" 2015-07-16 18:00:02 +00:00
Miao Wang
3ef2041cee fix BNNM docs
bug: 22507076
Change-Id: I5fdffdde597d97b1dde77574d096b81bff4aa382
(cherry picked from commit d7d413ad0bfaea2d4bb4adcd8011239c2f5f74ae)
2015-07-16 10:28:35 -07:00
Neil Fuller
eccbc7c96f Merge "Fix NativeCrashListener" 2015-07-16 10:26:18 +00:00
Narayan Kamath
1ecfdf33ee Merge "docs: Add an explicit dependency on libcore/Docs.mk" 2015-07-16 08:57:17 +00:00
Narayan Kamath
c21739aec8 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
2015-07-16 08:57:05 +00:00
Chris Tate
2fccb66deb Merge "Fix a bug disappearing installerPackageName info of packages after reboot." 2015-07-16 00:09:38 +00:00
Neil Fuller
e64f3e3fee Fix NativeCrashListener
In the move from InetUnixAddress to UnixSocketAddress
commit e9d537506bf19375fb932ac7d25ac9a9e3aef61d did not modify
the Os.accept() call in NativeCrashListener. It was passing
an empty InetSocketAddress.

The type could have been changed, but the peer address is
never used and it is safe to pass a null.

Bug: 3106438
Change-Id: I2a61221c4504657b3e1de848b0b493f202726126
2015-07-15 17:38:28 +01:00
Rayhaan Jaufeerally
b27b305768 Migrate Resources.java to use ICU4j drectly.
This change means that NativePluralRules can be removed in its entirety
because this is the only usage of that class.

Using a small benchmark from the NativePluralResources test, ICU4c code
takes 38.6 us and ICU4j code takes 49.2us to execute.

Change-Id: I5dbf643807c024a9c9c0f1292363fa8e39db965a
2015-07-15 16:12:14 +01:00
Narayan Kamath
b4db792381 Merge "Delete some obsolete test code." 2015-07-14 10:47:45 +00:00
Mathieu Chartier
ebac4d1b08 Merge "Change conditionallyCheckInstanceCounts to use countInstancesOfClasses" 2015-07-13 16:41:11 +00:00
Neil Fuller
886630c0d8 Merge "Switch shutdownInput / shutdownOutput to using Os.shutdown." 2015-07-13 15:02:05 +00:00
Elliott Hughes
188af04468 Merge "Revert "frameworks/base: libexpat now exports its headers."" 2015-07-11 01:08:14 +00:00
Elliott Hughes
ba7e659b55 Revert "frameworks/base: libexpat now exports its headers."
This reverts commit 2f31b66c04b1e80fd039418edf41e74f67b68143.

Change-Id: Ib4ce610d1767db5c72c54d33520e8bdf50171a18
2015-07-11 01:07:39 +00:00
Elliott Hughes
220b61f143 Merge "frameworks/base: libexpat now exports its headers." 2015-07-11 00:40:48 +00:00
Mathieu Chartier
d288a26672 Change conditionallyCheckInstanceCounts to use countInstancesOfClasses
countInstancesOfClasses allows passing multiple classes unlike
countInstanceOfClass. This provides a speedup since we dont traverse
the heap multiple times.

Changed ActivityThread.dumpMemInfo to do a GC since countInstancesOfClass
no longer does GC before counting.

https://code.google.com/p/android/issues/detail?id=177552

Change-Id: Ia85684f40cf59a52aa71a8479c711a994651209b
2015-07-10 15:33:59 -07:00
Elliott Hughes
2f31b66c04 frameworks/base: libexpat now exports its headers.
Change-Id: Iaba3d57db18ebdd89e4a993436e9bf844722ff87
2015-07-10 11:12:22 -07:00
Neil Fuller
a7f7c248c7 Switch shutdownInput / shutdownOutput to using Os.shutdown.
Bug: 3106438
Change-Id: I2c4817e435c6b253d6c507ea57bdfdfe45df8862
2015-07-10 12:30:07 +01:00
Narayan Kamath
85bdaae347 Delete some obsolete test code.
- Get rid of obsolete annotations in MediaInserterTest.

- Drop support for @BrokenTest and @SideEffect. Nobody uses
  SideEffect and none of the tests that use this test runner
  (vm-tests-tf, essentially) use @BrokenTest.

Change-Id: Id73c4d4eda8031689f9263c85b563c29e635d446
2015-07-09 18:23:53 +01:00
Narayan Kamath
43a2aca4c2 Merge "Remove @ToBeFixed from knowntags." 2015-07-09 17:22:14 +00:00