175194 Commits

Author SHA1 Message Date
Colin Cross
01efd7e820 Merge "Use build_number from file" 2015-07-23 18:23:06 +00: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
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
Narayan Kamath
e1b190c133 Remove @ToBeFixed from knowntags.
It's used nowhere and will be deleted shortly.

Change-Id: Ie87f16cd060445c0e0ccac4e9a192ca266c92851
2015-07-09 17:54:45 +01:00
Neil Fuller
2ca4f73e80 Merge "Switch LocalSocketImpl.accept() over to using Os.accept()" 2015-07-09 11:11:09 +00:00
Neil Fuller
c1eaeb9337 Switch LocalSocketImpl.accept() over to using Os.accept()
Bug: 3106438
Change-Id: I3b4a07cc2283c3cfdbaf3d2460f37264f67690e3
2015-07-09 09:45:01 +00:00
Neil Fuller
c83d18190d Merge "Switch from InetUnixAddress to UnixSocketAddress" 2015-07-09 09:44:32 +00:00
hyemin.hwang
7ee9a4ef14 Fix a bug disappearing installerPackageName info of packages after reboot.
If user install apps from playstore, system has installerPackageName attribute of app.
but, after reboot, some apps(have sharedUserID) installerPackageName attribute disappearing.
because lack of copy routine.
So, I added copy routine(installerPackageName).

Testcase :
1. Install app(has sharedUserId, ex Lync2013) from market.
2. Confirm package info from packages.xml(exist installer info).
3. reboot.
4. Re-confirm package info from packages.xml(not exist installer info).

Change-Id: I5f9597b0f0f23be21efdfc7c7780ce7cfd2b9672
2015-07-09 09:16:12 +09:00
Elliott Hughes
07e1c409ac Merge "Android always has <malloc.h>." 2015-07-08 18:12:25 +00:00
Neil Fuller
b05c2bebf8 Merge "Move listen() over to using android.system.Os" 2015-07-08 10:18:14 +00:00
Elliott Hughes
c64df290e4 Android always has <malloc.h>.
Change-Id: I9e18daeec26380c439f823e6a55ee61773c1b680
2015-07-07 19:19:34 -07:00
Neil Fuller
50d11ded0d Merge "Reimplement LocalSocket methods using android.system.Os" 2015-07-07 16:11:48 +00:00
Neil Fuller
e9d537506b Switch from InetUnixAddress to UnixSocketAddress
UnixSocketAddress is replacing InetUnixAddress.

Bug: 3106438
Change-Id: I7c03fa357adfb3221908294fd254c8faae91fd1b
2015-07-07 16:58:00 +01:00
Elliott Hughes
0254af6f68 Merge "Fix "Bluetooh" logging typo." 2015-07-07 06:00:56 +00:00
Elliott Hughes
7271613ed6 Fix "Bluetooh" logging typo.
Change-Id: I2b9aea64f1b53e100ead6e71835bf5935b410eb9
2015-07-06 22:10:36 -07:00
Mike Lockwood
593dfbb291 Merge "Miss USB device Interface from UsbManager.getDeviceList()." 2015-07-06 17:10:31 +00:00
wang.zhenyu
19b26f8754 Miss USB device Interface from UsbManager.getDeviceList().
In the scenario that you connect more than one device to android phone with an usb hub,
when you attach the second device,mNewConfigurationis is still corresponded to the first
device unless another mNewConfiguration is created by a new operation.
However,before another mNewConfiguration is created,setInterfaces() in addUsbConfiguration()
has already been executed. Problem is that mNewInterfaces has already been cleared when
it finished endUsbDeviceAdded for the first device. As a result,the UsbInterface descriptor
in the first device's Configuration descriptor is set to null.

Change-Id: I0ba4f07c809d07ebebed633e43c3ee8e2e4c5060
2015-07-06 11:35:44 +08:00
Neil Fuller
4fa438ef72 Move listen() over to using android.system.Os
Bug: 3106438
Change-Id: I9b4d1d58d84a28828555ae863e86530995191f2c
2015-07-03 17:58:00 +01:00
Neil Fuller
d2df87eb44 Reimplement LocalSocket methods using android.system.Os
InputStream.available()
OutputStream.flush()

Bug: 3106438
Change-Id: I3a9425c323229e27bb72f6232dd13f7579586840
2015-07-03 15:16:37 +01:00
Neil Fuller
761e39e189 Merge "Switch to using android.system.Os for more calls" 2015-07-03 14:07:34 +00:00
Neil Fuller
c80af6d84d Switch to using android.system.Os for more calls
The methods being switched here should involve no important
semantic changes. socket.getSoTimeout() is now implemented:
previously it would have returned 0 in all cases.

Some tidy up of unimplemented / commented code.

Switching other calls to use Os would carry more risk and
will be handled separately they can be switched safely.

Bug: 3106438
Change-Id: I5526249395565fee6e43f159a2b5975b0d41d058
2015-07-03 13:02:08 +01:00
Narayan Kamath
6bcdf90e49 Merge "Delete unused testing scripts and WithFramework." 2015-07-02 11:18:19 +00:00
Narayan Kamath
c21dab9dcb Delete unused testing scripts and WithFramework.
These scripts haven't worked in a long time now. run_core_test
uses VM options that aren't supported and WithFramework (which is
unmaintained) and run_junit.sh refers to an APK that doesn't
exist anymore.

If anyone wishes to run these tests individually, they can just
use vogar instead :
$ make vogar vogar.jar
$ vogar --mode=activity frameworks/base/tests/CoreTests/android/core/Sha1Test.java

This also allows us to delete the WithFramework class, which was
only referenced by these obsolete scripts.

bug: 22078684
Change-Id: I481f6721d51d50456421a1526c370b93aec9b351
2015-07-02 11:41:52 +01:00
Narayan Kamath
1d50879b1d Merge "Remove memory leak in PersistentDataBlockService jni" 2015-07-01 13:32:04 +00:00
Henrik Baard
c90ca48a7c Remove memory leak in PersistentDataBlockService jni
When calling the methods
 com_android_server_PersistentDataBlockService_getBlockDeviceSize()
 com_android_server_PersistentDataBlockService_wipe()
memory is leaked because string created by
 GetStringUTFChars() is not released.

Use ScopedUtfChars instead to ensure that memory is released.

Change-Id: I880a6d66a4824778b411b858774b8ffa009c1e17
2015-07-01 13:30:26 +00:00