OSDN Git Service
Neil Fuller [Thu, 20 Jul 2017 18:25:10 +0000 (18:25 +0000)]
Merge "Logging improvements for time zone updates"
am:
2cae07284d
Change-Id: Ic9e4b16d66164447f4937cf59d90ca8ecc9568ce
Neil Fuller [Thu, 20 Jul 2017 17:58:12 +0000 (17:58 +0000)]
Merge "Logging improvements for time zone updates"
Neil Fuller [Thu, 20 Jul 2017 10:00:35 +0000 (11:00 +0100)]
Logging improvements for time zone updates
Logging improvements for time zone updates:
1) Add EventLog entries time zone update service interactions.
2) Add more information to dumpsys logs to improve debugging.
Unit tests run with:
make -j30 FrameworksServicesTests
adb install -r -g \
"out/target/product/angler/data/app/FrameworksServicesTests/FrameworksServicesTests.apk"
adb shell am instrument -e package com.android.server.timezone -w \
com.android.frameworks.servicestests \
"com.android.frameworks.servicestests/android.support.test.runner.AndroidJUnitRunner"
Bug:
31008728
Test: See above for unit testing.
Test: Internal xTS tests
Test: adb shell dumpsys timezone
Test: adb logcat -b events -v threadtime -v printable -v uid -d *:v
Change-Id: I9356f4694e60b49e4b06aadd632d1bad517b8a29
Di Lu [Thu, 20 Jul 2017 07:36:19 +0000 (07:36 +0000)]
Merge "Add unit test for IpSecService"
am:
9e3f886dca
Change-Id: I16fb89239e641ac39a8a7adeafd72b7fe03935ed
Di Lu [Thu, 20 Jul 2017 07:27:16 +0000 (07:27 +0000)]
Merge "Add unit test for IpSecService"
Di Lu [Thu, 20 Jul 2017 05:52:10 +0000 (05:52 +0000)]
Merge "Add unit test for IpSecManager"
am:
dd494fa91c
Change-Id: I56c336eb8234b31154b6a7defd95ce76ea0800d8
Di Lu [Thu, 20 Jul 2017 05:42:53 +0000 (05:42 +0000)]
Merge "Add unit test for IpSecManager"
Andreas Gampe [Thu, 20 Jul 2017 05:36:42 +0000 (05:36 +0000)]
Merge "Zygote: Poll with timeout for pid"
am:
89d119abe6
Change-Id: I704192c4a2e1d0509f0f3c19b42945f2c00669ed
Treehugger Robot [Thu, 20 Jul 2017 05:25:24 +0000 (05:25 +0000)]
Merge "Zygote: Poll with timeout for pid"
ludi [Fri, 12 May 2017 16:15:00 +0000 (09:15 -0700)]
Add unit test for IpSecService
Test: runtest frameworks-net
Bug:
38259578
Change-Id: I4a049d5fdec79e36692e3b12306bd0758c19ad75
Ahmed ElArabawy [Thu, 20 Jul 2017 03:46:08 +0000 (03:46 +0000)]
Merge "Add Configuration to APF Policy"
am:
d27a6d62c6
Change-Id: I491bad86e4e9ae7a813ac214b06273719a583079
Treehugger Robot [Thu, 20 Jul 2017 03:34:57 +0000 (03:34 +0000)]
Merge "Add Configuration to APF Policy"
Steven Moreland [Thu, 20 Jul 2017 02:50:53 +0000 (02:50 +0000)]
Merge "frameworks/base: use proper nativehelper headers"
am:
826eafd958
Change-Id: I36f10ff4d963284a313f1cc5b368f82549a4adb2
Andreas Gampe [Thu, 13 Jul 2017 02:17:52 +0000 (19:17 -0700)]
Zygote: Poll with timeout for pid
Do not use a blocking readInt. Poll for available bytes with a timeout.
(cherry picked from commit
cbc421406193308667a38b0bebc16c4064a19e83)
Bug:
63638768
Test: m
Test: cts-tradefed run commandAndExit cts-dev -m CtsWrapWrapDebugTestCases
Change-Id: Ib2131c00aa47dd10bb940d8678bbbfb5a0346ad5
Treehugger Robot [Thu, 20 Jul 2017 02:42:49 +0000 (02:42 +0000)]
Merge "frameworks/base: use proper nativehelper headers"
Ahmed ElArabawy [Tue, 13 Jun 2017 01:01:11 +0000 (18:01 -0700)]
Add Configuration to APF Policy
in b/
37702435 battery was drained due to reception of
Ethernet frames with Eth-type < 0x600 (non ehternet II frames)
This change adds an XML file to drop/allow these frames
Dropping helps tp avoid acquiring a wakelock for the
reception of these packets, while allowing them may be needed
for some protocols
The Change allow the OEM to override the system settings
Bug:
37702435
Test: runtest frameworks-net
Merged-In: Idb6c215896ef230a8136ff4ecefc90ccdc5c1c6d
Merged-In: I16346bb98a0b9259f7c3f51e318c472cfc1bb492
Signed-off-by: Ahmed ElArabawy <arabawy@google.com>
(cherry pick from commit
4dd7c58fc8fcc5a2c50de5e8eff05ddc5c3b0b8b)
Change-Id: Ie466baf1e6395d6c28245e41179232ea8e523845
ludi [Fri, 12 May 2017 16:15:00 +0000 (09:15 -0700)]
Add unit test for IpSecManager
Test: runtest frameworks-net
Bug:
38259578
Change-Id: Idb76aab899ccb7145bef2b7dce36e115c25fa6ca
Robert Greenwalt [Thu, 20 Jul 2017 00:30:50 +0000 (00:30 +0000)]
Merge "Add details to Download progress callback"
am:
b440b572d7
Change-Id: Idb7ebf8ec5d0b6b341c97dab05efc94e9e629011
Treehugger Robot [Thu, 20 Jul 2017 00:23:48 +0000 (00:23 +0000)]
Merge "Add details to Download progress callback"
Hall Liu [Wed, 19 Jul 2017 23:58:16 +0000 (23:58 +0000)]
Merge "Add timezone for Telecom event date formatting"
am:
bf296640e6
Change-Id: Ic9db643ff6d204f75aed44160003bbe0b685eb7e
Treehugger Robot [Wed, 19 Jul 2017 23:46:52 +0000 (23:46 +0000)]
Merge "Add timezone for Telecom event date formatting"
Robert Greenwalt [Sat, 17 Jun 2017 00:37:20 +0000 (17:37 -0700)]
Add details to Download progress callback
Split decode into max size and current size.
Test: builds
Change-Id: Ice18d7f0e9ae99b3c24fe10843da80abd0d912d7
Hall Liu [Wed, 19 Jul 2017 21:57:56 +0000 (14:57 -0700)]
Add timezone for Telecom event date formatting
Output event times in local time rather than in UTC for compatibility
with the rest of the timestamps in the bug report
Test: manual
Change-Id: I2d458f09aec635a43e3d0565e8f8da803124f368
George Burgess IV [Wed, 19 Jul 2017 17:36:23 +0000 (17:36 +0000)]
Merge "Fix static analyzer complaints"
am:
a3bde81205
Change-Id: I39f7b56c6abc0398cd517eef174b0620dbc50caa
Treehugger Robot [Wed, 19 Jul 2017 17:26:36 +0000 (17:26 +0000)]
Merge "Fix static analyzer complaints"
Steven Moreland [Wed, 19 Jul 2017 16:50:45 +0000 (09:50 -0700)]
frameworks/base: use proper nativehelper headers
libnativehelper exports headers under nativehelper. These were
available before incorrectly as global headers in order to give
access to jni.h.
Test: modules using frameworks/base find headers
Bug:
63762847
Change-Id: I0f9f231acdebe460f279135462f43d3e32eff64d
Carlos Vinueza [Wed, 19 Jul 2017 14:26:55 +0000 (14:26 +0000)]
Merge "Adding 26 free short codes for DCB and other purposes"
am:
1585b2e7b7
Change-Id: Ia85bdccb4c6b15c6b5b7974f4cb5cc34af04d8d1
Treehugger Robot [Wed, 19 Jul 2017 14:13:36 +0000 (14:13 +0000)]
Merge "Adding 26 free short codes for DCB and other purposes"
Neil Fuller [Wed, 19 Jul 2017 09:51:17 +0000 (09:51 +0000)]
Merge "Re-enable some test cases"
am:
8feaad7249
Change-Id: I1b86866748afa6d6014abcbf59116a7abf67b54e
Neil Fuller [Wed, 19 Jul 2017 09:40:52 +0000 (09:40 +0000)]
Merge "Re-enable some test cases"
Hugo Benichi [Wed, 19 Jul 2017 08:04:48 +0000 (08:04 +0000)]
Merge "ConnectivityServiceTest: fix testNetworkInfoOfTypeNone"
am:
24a2adfa27
Change-Id: I4be1d2ce67871c1e01364beca886fdd3af374321
Treehugger Robot [Wed, 19 Jul 2017 07:54:45 +0000 (07:54 +0000)]
Merge "ConnectivityServiceTest: fix testNetworkInfoOfTypeNone"
Hugo Benichi [Wed, 19 Jul 2017 01:10:52 +0000 (10:10 +0900)]
ConnectivityServiceTest: fix testNetworkInfoOfTypeNone
This patch fixes a couple of flakyness issues with
testNetworkInfoOfTypeNone. It also fixes some typos and naming issues.
Bug:
62918393,
62918393
Test: runtest frameworks-net
Change-Id: I1c56557ab113d3ef57dbc06a6e882634d03c5b09
Steven Moreland [Tue, 18 Jul 2017 02:00:43 +0000 (19:00 -0700)]
Reference nativehelper/jni.h as jni.h
nativehelper will no longer export nativehelper/jni.h so that everywhere
can reference this file with the same name.
Bug:
63762847
Change-Id: I3e58d478a2eb17b19db540414545a3c1f9c381af
(cherry picked from commit
98f40c71399e63f2b10cf6e3dffbbcea84d52490)
Hugo Benichi [Wed, 19 Jul 2017 01:06:59 +0000 (01:06 +0000)]
Merge "IpManager: fix test for default ProvisioningConfiguration"
am:
2627d4856b
Change-Id: I087aee995858ae898f5d660c11552724a07503c3
Treehugger Robot [Wed, 19 Jul 2017 00:58:11 +0000 (00:58 +0000)]
Merge "IpManager: fix test for default ProvisioningConfiguration"
Robert Quattlebaum [Tue, 18 Jul 2017 23:33:08 +0000 (23:33 +0000)]
Merge "NetworkCapabilities: Unhide TRANSPORT_LOWPAN"
am:
777c408a22
Change-Id: I3ae9566ca52b9dae87cace18b1e97897eb8de0ad
Billy Lam [Tue, 18 Jul 2017 23:30:46 +0000 (23:30 +0000)]
Merge "GC in heapDumpFinished to cleanup hprof fd"
am:
f126c41de7
Change-Id: I7025d5810dccb6b2637249063f08c80b1ab7e8d0
Treehugger Robot [Tue, 18 Jul 2017 23:09:58 +0000 (23:09 +0000)]
Merge "NetworkCapabilities: Unhide TRANSPORT_LOWPAN"
Lorenzo Colitti [Tue, 18 Jul 2017 21:17:33 +0000 (06:17 +0900)]
resolve merge conflicts of
a1d67fb38ec0 to stage-aosp-master
Test: make -j64 services
Change-Id: I3955b01189993f3051c608bc5d07a87e4e3b5f0b
Merged-In: Ic1e799c17b4bb0272cf85e03d5ad14981a55defa
Treehugger Robot [Tue, 18 Jul 2017 22:30:31 +0000 (22:30 +0000)]
Merge "GC in heapDumpFinished to cleanup hprof fd"
Billy Lam [Tue, 18 Jul 2017 19:01:44 +0000 (12:01 -0700)]
GC in heapDumpFinished to cleanup hprof fd
Previously the fd associated with the dump file was
not closed until the next GC. While this did not
affect AMS, external systems relying on monitoring
the close event on the file could not accurately
know when a dump operation was finished.
Bug:
62907010
Test: Manually flashed and tested
Change-Id: I0f6988099f479468f674eb7483f1f14529852270
nharold [Tue, 18 Jul 2017 20:18:10 +0000 (20:18 +0000)]
Merge "Launch NetD in a different thread"
am:
c721dce3fc
Change-Id: I0edeac83cc31b7ff9b264c35e225707ebb8418f2
Tom Cherry [Tue, 18 Jul 2017 20:13:25 +0000 (20:13 +0000)]
Merge "Remove ALOGD_IF_SLOW"
am:
b793aa8c81 -s ours
Change-Id: Id80a4061331c073f7283bd9c0a708e4faf8dc7f7
Neil Fuller [Tue, 18 Jul 2017 20:09:26 +0000 (20:09 +0000)]
Merge "Remove a TODO associate with starting a thread"
am:
c685e1e4a1
Change-Id: I5c9f30ac024a1ccf6fe0e5cba1534dcad4317e25
Steven Moreland [Tue, 18 Jul 2017 20:05:36 +0000 (20:05 +0000)]
Merge "Reference nativehelper/jni.h as jni.h"
am:
899a1f23c5
Change-Id: I30ec4f6b329360ea4161f2ad5538ecd238db7b62
Lorenzo Colitti [Tue, 18 Jul 2017 18:45:29 +0000 (18:45 +0000)]
Merge changes from topic 'tether-offload-cherrypick'
* changes:
Add code to dump OffloadController state.
Fetch tethering offload stats.
Allow more than one source of tethering statistics.
nharold [Tue, 18 Jul 2017 17:56:35 +0000 (17:56 +0000)]
Merge "Launch NetD in a different thread"
Tom Cherry [Tue, 18 Jul 2017 17:20:39 +0000 (17:20 +0000)]
Merge "Remove ALOGD_IF_SLOW"
George Burgess IV [Wed, 21 Jun 2017 06:53:29 +0000 (23:53 -0700)]
Fix static analyzer complaints
frameworks/base/core/jni/android_view_MotionEvent.cpp:383:12: warning:
Potential leak of memory pointed to by 'event'
frameworks/base/core/jni/AndroidRuntime.cpp:975:20: warning: Null passed
to a callee that requires a non-null 1st parameter
For the former, it was surprising to me that the analyzer couldn't
figure out that `event == nativePtr` for the latter check. Filed
https://bugs.llvm.org/show_bug.cgi?id=33540 upstream about it.
For the latter, it was complaining because `className` could be NULL
(more precisely, we have a NULL check at the top of the function it's
declared in, so NULL is presumably a valid value).
Bug: None
Test: Ran mma; complaints are gone.
Change-Id: I26a91ae25934f95acbfdbe4f3641e081fbc66c6d
Lorenzo Colitti [Wed, 12 Jul 2017 16:48:26 +0000 (01:48 +0900)]
Add code to dump OffloadController state.
(cherry-picked from commit
c2519c5feae397e18561e00acea9d5e456bfaabe)
Bug:
29337859
Bug:
32163131
Test: observed output of "adb shell dumpsys connectivity tethering"
Change-Id: Icc5aa605cd64a4a2bb5993941dcc4010cc0b1d8e
Merged-In: Icc5aa605cd64a4a2bb5993941dcc4010cc0b1d8e
Lorenzo Colitti [Wed, 12 Jul 2017 06:48:07 +0000 (15:48 +0900)]
Fetch tethering offload stats.
Make tethering offload register an ITetheringStatsProvider and
fetch tethering stats from the hardware.
Currently we fetch stats in the following cases:
1. Just after changing upstreams, we fetch stats from the
previous upstream.
2. When we are polled by NetworkStatsService.
(cherry-picked from commit
5a7dea1a8eb2cf53fc1d5a52004647de94150e62)
Bug:
29337859
Bug:
32163131
Test: builds, boots
Test: stats appear in tethering logs
Change-Id: If744f2e06cb6a3095a40199936b9afb76eff7b56
Merged-In: If744f2e06cb6a3095a40199936b9afb76eff7b56
Lorenzo Colitti [Mon, 10 Jul 2017 10:06:57 +0000 (19:06 +0900)]
Allow more than one source of tethering statistics.
Currently, netd is the only source of tethering statistics.
In order to support multiple sources, define a new
ITetheringStatsProvider interface that can be registered with
NetworkManagmentService. Convert the existing code into the
first ITetheringStatsProvider.
(cherry picked from commit
ef7b2a13ce4c34950b52de27dcf65b74388d7b3d)
Bug:
29337859
Bug:
32163131
Test: builds, boots
Test: tethering stats continue to be collected
Change-Id: Ie1b5a5e47ae4bf5af922365b09fa241e834236e4
Merged-In: Ie1b5a5e47ae4bf5af922365b09fa241e834236e4
Treehugger Robot [Tue, 18 Jul 2017 15:17:25 +0000 (15:17 +0000)]
Merge "Remove a TODO associate with starting a thread"
Carlos Vinueza [Fri, 7 Jul 2017 19:19:29 +0000 (12:19 -0700)]
Adding 26 free short codes for DCB and other purposes
Whitelist free short code batch 2017 Q2 - Android Partner Engineering
The list includes 2 short codes used for spam reports in GB, 15 for free
carrier services and 9 for for Direct Carrier Billing purposes in
different geos.
Test: manual - uploaded modified file onto test device and tested
sending SMS to changed shortcodes to verify behaviour.
Bug:
37355429
Change-Id: Idb0a1b76619fc635659922083bd19423d96229f1
Signed-off-by: Carlos Vinueza <chinesco@google.com>
Neil Fuller [Tue, 18 Jul 2017 13:02:01 +0000 (14:02 +0100)]
Remove a TODO associate with starting a thread
Switching to an alternative method to run something off
thread.
Bug:
31008728
Test: Internal automated testing / manual tests
Change-Id: Ia33ca29e8d83028a21af1dca22de75dd43eee119
Hugo Benichi [Tue, 18 Jul 2017 07:17:49 +0000 (16:17 +0900)]
IpManager: fix test for default ProvisioningConfiguration
The test did not properly account for the stopAllIP() done in starting
state of the IpManager state machine, which could cause assertions to
fail when stopAllIP() is called again after stop().
Bug:
62988545
Test: runtest frameworks-net
Change-Id: I2c6eb76461a81c1d743bf448da36c58a99ce082d
Fredrik Roubert [Thu, 6 Apr 2017 20:13:51 +0000 (22:13 +0200)]
Update JNI code in preparation for ICU 59 switching to C++11 char16_t.
ICU 59 (update pending on the aosp/icu59 branch) has switched to using
the C++11 char16_t data type, which is a distinct type from uint16_t
(which is what JNI's jchar is typedef'd as), even though they are
bitwise identical.
All code that passes UTF-16 data between ICU4C and JNI must therefore be
updated with typecasts in the appropriate places before ICU 59 is merged
to aosp/master.
Bug:
37554848
Test: make
Change-Id: Ibbc90d2b603382d4715551d05c4a6a462529542d
Merged-In: Ic84a94be82acbef41f80cc113d5da485ce54ae29
Neil Fuller [Tue, 18 Jul 2017 09:30:53 +0000 (10:30 +0100)]
Re-enable some test cases
Re-enable some test cases now the case they test has been
renabled (by commit
3d7a4143d5a2b771a02777354c9a11c981c63c59).
Tested with:
make -j30 FrameworksServicesTests
adb install -r -g \
"out/target/product/angler/data/app/FrameworksServicesTests/FrameworksServicesTests.apk"
adb shell am instrument -e package com.android.server.timezone -w \
com.android.frameworks.servicestests \
"com.android.frameworks.servicestests/android.support.test.runner.AndroidJUnitRunner"
Bug:
31008728
Test: See above
Change-Id: Ia26c4355e41d5b1010594a06bb8c4e8cef8528f7
Nathan Harold [Mon, 17 Jul 2017 21:01:53 +0000 (14:01 -0700)]
Launch NetD in a different thread
Calling run() launches in the current thread;
we want to call start() to launch in a separate
thread to unblock system initialization.
Bug: none
Test: compilation
Change-Id: Ia85059100add6a44a5e3262500b00ba8ca21e125
Treehugger Robot [Tue, 18 Jul 2017 02:47:33 +0000 (02:47 +0000)]
Merge "Reference nativehelper/jni.h as jni.h"
Mark Salyzyn [Mon, 17 Jul 2017 22:34:23 +0000 (22:34 +0000)]
Merge "BootReceiver: check console-ramoops-0"
am:
a09784ac75
Change-Id: Ic3af3fd4f768f391740d56bd73c7dcca7698d1de
Neil Fuller [Mon, 17 Jul 2017 22:32:37 +0000 (22:32 +0000)]
Merge "Address post-commit review comments"
am:
858634e4ec
Change-Id: Ia530cc2cdf583baae825386a52fdb8eb3763d99b
Neil Fuller [Mon, 17 Jul 2017 22:26:48 +0000 (22:26 +0000)]
Merge "Remove unnecessary TODOs"
am:
a5c96cf4bf
Change-Id: I1e03cd3fa9eef34218e4a4eb958fbb6dd0593be6
Treehugger Robot [Mon, 17 Jul 2017 22:24:39 +0000 (22:24 +0000)]
Merge "BootReceiver: check console-ramoops-0"
Neil Fuller [Mon, 17 Jul 2017 22:24:36 +0000 (22:24 +0000)]
Merge "Remove TODOs that are not needed"
am:
0f9842304a
Change-Id: Ie46a57ce88e25e40193b073c0add69adccc14a79
Neil Fuller [Mon, 17 Jul 2017 22:19:07 +0000 (22:19 +0000)]
Merge "Address post-commit review comments"
Neil Fuller [Mon, 17 Jul 2017 22:15:42 +0000 (22:15 +0000)]
Merge "Remove unnecessary TODOs"
Neil Fuller [Mon, 17 Jul 2017 22:15:08 +0000 (22:15 +0000)]
Merge "Remove TODOs that are not needed"
xutianguo [Mon, 17 Jul 2017 21:58:04 +0000 (21:58 +0000)]
Merge "Make BluetoothStateChangeCallback oneway to prevent waiting on response."
am:
66af025fea
Change-Id: Iab47add488fd9f4e09f2d0a2aacb435b0cdb24d0
Treehugger Robot [Mon, 17 Jul 2017 21:47:31 +0000 (21:47 +0000)]
Merge "Make BluetoothStateChangeCallback oneway to prevent waiting on response."
Mark Salyzyn [Fri, 14 Jul 2017 20:08:47 +0000 (13:08 -0700)]
BootReceiver: check console-ramoops-0
On later kernels /sys/fs/pstore/console-ramoops becomes
/sys/fs/pstore/console-ramoops-0
Test: none
Bug:
63058217
Change-Id: Ia68c0b5741c35cb35f10be6bbce93e0f0c92480f
Tom Cherry [Mon, 17 Jul 2017 19:20:58 +0000 (19:20 +0000)]
Merge "Remove ALOGD_IF_SLOW" into stage-aosp-master
Steven Moreland [Mon, 17 Jul 2017 19:08:45 +0000 (12:08 -0700)]
Reference nativehelper/jni.h as jni.h
nativehelper will no longer export nativehelper/jni.h so that everywhere
can reference this file with the same name.
Bug:
63762847
Change-Id: I8d2e9587439efa2d6ab03a5bdfa749fc620759e1
xutianguo [Mon, 22 May 2017 06:03:33 +0000 (14:03 +0800)]
Make BluetoothStateChangeCallback oneway to prevent waiting on response.
Test: Connected bluetooth devices(included Headset/HID devices), and
made bluetooth enabling/disabling over 1000 times, no other side effect
observed.
Bug:
38485770
Change-Id: Ia3959d2441aece39a79ab2d662b57790a78df674
Signed-off-by: xutianguo <xutianguo@xiaomi.com>
(cherry picked from commit
95e1e21a639318bb3399c394707624393cfa2300)
nharold [Mon, 17 Jul 2017 17:52:25 +0000 (17:52 +0000)]
Merge "Check ManagedResource is NonNull before Checking Owner"
am:
d1ffb13437
Change-Id: I2e8cde8a7be8bdbdeebb00df053fdc621d30cdec
Fredrik Roubert [Mon, 17 Jul 2017 17:50:02 +0000 (17:50 +0000)]
Merge "Update JNI code in preparation for ICU 59 switching to C++11 char16_t."
am:
0f3d90eec8 -s ours
Change-Id: If37c0a67a40a2b1ee0d5e3050cba38af5e932e83
Neil Fuller [Mon, 17 Jul 2017 17:02:29 +0000 (18:02 +0100)]
Remove unnecessary TODOs
The classes under test are not part of a public
API so they are not tested via CTS.
Bug:
31008728
Test: make droid
Change-Id: If10db42b6e79728a6625708d35a04c5002164866
Neil Fuller [Mon, 3 Jul 2017 13:38:50 +0000 (14:38 +0100)]
Remove TODOs that are not needed
Remove TODOs to add classes to the system API that are not needed
(since they are used by a platform-only app).
Bug:
31008728
Test: make droid
Change-Id: I0d75686ddeae929e9d87c5ca8703a609a1450d76
Merged-In: I600e7b08853b86b27463193411cf85207ae09ce8
nharold [Mon, 17 Jul 2017 16:57:01 +0000 (16:57 +0000)]
Merge "Check ManagedResource is NonNull before Checking Owner"
Treehugger Robot [Mon, 17 Jul 2017 16:46:09 +0000 (16:46 +0000)]
Merge "Update JNI code in preparation for ICU 59 switching to C++11 char16_t."
Fredrik Roubert [Thu, 6 Apr 2017 20:13:51 +0000 (22:13 +0200)]
Update JNI code in preparation for ICU 59 switching to C++11 char16_t.
ICU 59 (update pending on the aosp/icu59 branch) has switched to using
the C++11 char16_t data type, which is a distinct type from uint16_t
(which is what JNI's jchar is typedef'd as), even though they are
bitwise identical.
All code that passes UTF-16 data between ICU4C and JNI must therefore be
updated with typecasts in the appropriate places before ICU 59 is merged
to aosp/master.
Bug:
37554848
Test: make
Change-Id: Ibbc90d2b603382d4715551d05c4a6a462529542d
Merged-In: Ic84a94be82acbef41f80cc113d5da485ce54ae29
Przemyslaw Szczepaniak [Mon, 17 Jul 2017 10:48:50 +0000 (10:48 +0000)]
Merge "Track libcore commit
58228b82c64808eddac02736f18f5003730443a0"
am:
29926838d4
Change-Id: I7c0f6b9c064ce7eba1eb0cd4c6bca7464ce24100
Przemyslaw Szczepaniak [Mon, 17 Jul 2017 10:37:35 +0000 (10:37 +0000)]
Mathieu Chartier [Fri, 14 Jul 2017 21:37:43 +0000 (21:37 +0000)]
Merge "Add more details to dumpsys meminfo -d"
am:
4ccf8b83a1
Change-Id: I54fadc1bd30cc508faccabe1553c2db4cc040904
Treehugger Robot [Fri, 14 Jul 2017 21:21:39 +0000 (21:21 +0000)]
Merge "Add more details to dumpsys meminfo -d"
Tom Cherry [Mon, 10 Jul 2017 21:31:18 +0000 (14:31 -0700)]
Remove ALOGD_IF_SLOW
ALOGD_IF_SLOW isn't intuitively implemented as it cannot handle
temporaries used as its parameters. Since there are so few users of
it already and since it's just sugar on top of 2 otherwise trivial
lines, we opt to remove it entirely.
Bug:
62820330
Test: Build
Change-Id: I196443b3717497f6cab31bfaee94a229e4838556
Merged-In: I196443b3717497f6cab31bfaee94a229e4838556
Mathieu Chartier [Thu, 13 Jul 2017 22:01:34 +0000 (15:01 -0700)]
Add more details to dumpsys meminfo -d
Added new subitems for
.dex:
boot vdex
app vdex
app odex
.art
app art
boot art
Fixed accounting for dalvik other to be subitems of other subsection
instead of dalvik.
Sample output:
261,892K: Native
213,196K: .dex mmap
111,620K: .App vdex
65,070K: .App dex
36,506K: .Boot vdex
192,320K: EGL mtrack
161,835K: .so mmap
134,922K: .apk mmap
85,612K: Dalvik
74,656K: .Heap
4,526K: .Zygote
4,218K: .LOS
2,212K: .NonMoving
64,906K: Unknown
52,119K: .oat mmap
42,828K: Dalvik Other
32,704K: .LinearAlloc
3,672K: .JITCache
3,248K: .IndirectRef
3,204K: .GC
40,754K: .art mmap
31,133K: .Boot art
9,621K: .App art
21,976K: Other mmap
20,704K: Stack
16,270K: Gfx dev
9,200K: GL mtrack
3,428K: Other dev
2,744K: .ttf mmap
1,116K: Ashmem
1,052K: .jar mmap
0K: Cursor
0K: Other mtrack
Test: dumpsys meminfo -d
Test: dumpsys meminfo -s
Test: dumpsys meminfo
Test: dumpsys meminfo <pid>
Test: dumpsys memifno -d <pid>
Bug:
32331673
(cherry picked from commit
95550dd39440196d364767fc18d441ed5a0e36d6)
Change-Id: I7557ee09510651c7b5ddee646c92adbcdd3472db
Hall Liu [Fri, 14 Jul 2017 02:43:10 +0000 (02:43 +0000)]
Merge "Clean up streaming API docs and organize errors"
am:
d2c8dcfcfe
Change-Id: I9d77d7dbc3c53baaa0ce4928de3bcbe353c1f6ab
Treehugger Robot [Fri, 14 Jul 2017 02:32:21 +0000 (02:32 +0000)]
Merge "Clean up streaming API docs and organize errors"
Hugo Benichi [Thu, 13 Jul 2017 22:25:51 +0000 (07:25 +0900)]
resolve merge conflicts of
4f2a0fe213e5 to stage-aosp-master
Test: I solemnly swear I tested this conflict resolution.
Change-Id: I61cfb2d4798350f28f1bb36aed67ee8f18895031
Treehugger Robot [Thu, 13 Jul 2017 20:45:21 +0000 (20:45 +0000)]
Merge "IpManager: define InitialConfiguration"
Hugo Benichi [Fri, 23 Jun 2017 01:07:08 +0000 (10:07 +0900)]
IpManager: define InitialConfiguration
This patch adds a InitialConfiguration class to IpManager for specifying
IP information in IpManager ProvisioningConfiguration at IpManager
startup.
At the moment this InitialConfiguration is not used, but is validated in
startProvsiioning if ProvisioningConfiguration includes one. It will be
integrated into IpManager IP provisioning logic in follow-up patches.
This patch also includes an example of data driven unit tests using a
table of test case. The highlights of this methodology are:
1) easy extensibility for new test case,
2) rich and informative error messages,
Unfortunately Java support for inlined data structure literals is poor
and some companion static methods for data generation are required for
enabling this methodology.
Bug:
62988545
Test: added new test in FrameworksNetTests,
$ runtest frameworks-net
$ runtest frameworks-wifi
Merged-In: I060b02603af7d73a6407df89344bf0c000574af2
(cherry pick of commit
2757fcf3a13b0addc4a168a12c72ac2fc418b012)
Change-Id: I48dbf89232d7758f1b07ed4d76ce93281e5c6b53
Timur Iskhakov [Thu, 13 Jul 2017 19:21:42 +0000 (19:21 +0000)]
Merge "Add configureRpcThreadpool to java interface"
am:
d8dab11547
Change-Id: I958ef6fc2d667a691e39e9fadd07303085a499f9
Treehugger Robot [Thu, 13 Jul 2017 19:11:39 +0000 (19:11 +0000)]
Merge "Add configureRpcThreadpool to java interface"
Przemyslaw Szczepaniak [Wed, 12 Jul 2017 15:48:41 +0000 (16:48 +0100)]
Track libcore commit
58228b82c64808eddac02736f18f5003730443a0
Test: CtsLibcoreTestCases
Bug:
62949898
Change-Id: Icc41052e9476cc08bf3fa9579964f141d164c36c
Neil Fuller [Thu, 13 Jul 2017 10:59:41 +0000 (10:59 +0000)]
Merge "Re-enable use of isPrivilegedApp()"
am:
bd51de1b20
Change-Id: I3e41058a76b840dfcd1b5171b8c6688509f1fd7d
Neil Fuller [Thu, 13 Jul 2017 10:50:23 +0000 (10:50 +0000)]
Merge "Re-enable use of isPrivilegedApp()"
Erik Kline [Thu, 13 Jul 2017 09:00:56 +0000 (09:00 +0000)]
Merge "Program offload-exempt local prefixes into the HAL"
am:
de837a97aa
Change-Id: I741b6e31fb3adc922f47df824188786ff35e3aa9
Treehugger Robot [Thu, 13 Jul 2017 08:53:05 +0000 (08:53 +0000)]
Merge "Program offload-exempt local prefixes into the HAL"