OSDN Git Service
Di Lu [Thu, 20 Jul 2017 05:42:53 +0000 (05:42 +0000)]
Merge "Add unit test for IpSecManager"
Treehugger Robot [Thu, 20 Jul 2017 05:25:24 +0000 (05:25 +0000)]
Merge "Zygote: Poll with timeout for pid"
Treehugger Robot [Thu, 20 Jul 2017 03:34:57 +0000 (03:34 +0000)]
Merge "Add Configuration to APF Policy"
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
Treehugger Robot [Thu, 20 Jul 2017 00:23:48 +0000 (00:23 +0000)]
Merge "Add details to Download progress callback"
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
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
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:40:52 +0000 (09:40 +0000)]
Merge "Re-enable some test cases"
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
Treehugger Robot [Wed, 19 Jul 2017 00:58:11 +0000 (00:58 +0000)]
Merge "IpManager: fix test for default ProvisioningConfiguration"
Treehugger Robot [Tue, 18 Jul 2017 23:09:58 +0000 (23:09 +0000)]
Merge "NetworkCapabilities: Unhide TRANSPORT_LOWPAN"
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
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
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"
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: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"
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
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)
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:37:35 +0000 (10:37 +0000)]
Treehugger Robot [Fri, 14 Jul 2017 21:21:39 +0000 (21:21 +0000)]
Merge "Add more details to dumpsys meminfo -d"
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
Treehugger Robot [Fri, 14 Jul 2017 02:32:21 +0000 (02:32 +0000)]
Merge "Clean up streaming API docs and organize errors"
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
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:50:23 +0000 (10:50 +0000)]
Merge "Re-enable use of isPrivilegedApp()"
Treehugger Robot [Thu, 13 Jul 2017 08:53:05 +0000 (08:53 +0000)]
Merge "Program offload-exempt local prefixes into the HAL"
Erik Kline [Tue, 4 Jul 2017 09:28:11 +0000 (18:28 +0900)]
Program offload-exempt local prefixes into the HAL
Test: as follows
- built
- flashed
- booted
- "runtest frameworks-net" passes
- observed calls to the HAL setLocalPrefixes in tethering log
Bug:
29337859
Bug:
32163131
Merged-In: I3c3bd4ee83ffe86ddbe6a16fbbfa0756bf5064d4
Merged-In: Iaf80e584df458010741401fc1a19e7f6e21923c1
Merged-In: Ifaf23c6179ead9de6ccfcf41e0c203025153167b
(cherry picked from commit
32179ff81511e00aef31e8fda705be3df074ece6)
Change-Id: I65ea833ac6fe7a75ebe546cfa358c4cffdf2de05
Treehugger Robot [Thu, 13 Jul 2017 03:38:46 +0000 (03:38 +0000)]
Merge "Revert "Fix ContentObserver unregister issue""
Fyodor Kupolov [Thu, 13 Jul 2017 01:44:36 +0000 (01:44 +0000)]
Revert "Fix ContentObserver unregister issue"
This reverts commit
2df4e144a913b705c50bde929c75744b251967d9.
It was causing failures in packages/apps/DocumentsUI tests
Bug:
63638102
Bug:
63154326
Change-Id: I51fb54f705f58f159f4fcc30bfed41ababcba950
Timur Iskhakov [Mon, 10 Jul 2017 17:08:38 +0000 (10:08 -0700)]
Add configureRpcThreadpool to java interface
Bug:
36233029
Test: links, compiles, hidl_test_java
Change-Id: I7e2ec88b2098886983b1d93ab100a77db63f3976
Hall Liu [Fri, 7 Jul 2017 20:33:16 +0000 (13:33 -0700)]
Clean up streaming API docs and organize errors
* Implement listPendingDownloads and resetDownloadKnowledge
* Bring MbmsStreamingManager docs in line with vendor-side API docs.
* Remove activeStreamingServicesUpdated
* Reorganize the errors in MbmsException into categories.
* Add some vendor API docs for file-download
Change-Id: Ia29066ea6f2c0414171cffa1ae11bb467f187bee
Hall Liu [Wed, 12 Jul 2017 23:18:37 +0000 (23:18 +0000)]
Merge "Implement getDownloadStatus and add permission"
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
Treehugger Robot [Wed, 12 Jul 2017 17:39:56 +0000 (17:39 +0000)]
Merge "Avoid exposing OffloadCallbackEvent values"
Treehugger Robot [Wed, 12 Jul 2017 17:35:15 +0000 (17:35 +0000)]
Merge "Stop unnecessary tethering reconfigurations"
Neil Fuller [Wed, 12 Jul 2017 16:18:19 +0000 (17:18 +0100)]
Re-enable use of isPrivilegedApp()
Re-enable use of isPrivilegedApp() since it appears to work.
Bug:
35995024
Bug:
31008728
Test: Manual testing
Change-Id: If5a59aeba19320d55b42ff3dd28a654bce27dd35
Erik Kline [Tue, 11 Jul 2017 15:15:26 +0000 (00:15 +0900)]
Avoid exposing OffloadCallbackEvent values
Keep the android.hardware.tetheroffload.control.V1_0.OffloadCallbackEvent
import from leaking outside of OffloadHardwareInterface by converting each
event type into a separate callback.
Add basic logging implementation in OffloadController. Seems like every
call just needs to log save for two that actually need to do work:
- onSupportAvailable()
* poll stats and notify NetworkStatsService
* (re)push all state, as the hardware now supports offload (again)
- onStoppedLimitReached()
* poll stats and notify NetworkStatsService
Test: as follows
- built
- flashed
- booted
- "runtest frameworks-net" passed
Bug:
29337859
Bug:
32163131
Merged-In: I7c7675922a561a4642120df51715a550dab7f503
Merged-In: Ie91b974fbf70a4242f8b220d5fa3d6a0de59201d
Merged-In: I46c2e5252ae72a09a1550862847c1af441ece072
(cherry picked from commit
a0885000f227ebf15f0b78d1d28c7a5de4afa8ea)
Change-Id: I1981d8da79f24dd0b4d76b930a5f179682500294
Treehugger Robot [Wed, 12 Jul 2017 15:37:40 +0000 (15:37 +0000)]
Merge "Address further API review comments"
Treehugger Robot [Wed, 12 Jul 2017 15:36:18 +0000 (15:36 +0000)]
Merge "Add OffloadHardwareInterface.getForwardedStats() wrapper"
Erik Kline [Sat, 8 Jul 2017 11:36:37 +0000 (20:36 +0900)]
Stop unnecessary tethering reconfigurations
The TetheringConfiguraiton is retrieved at startup and on every
ACTION_CONFIGURATION_CHANGED broadcast. Re-retrieving the config
at every upstream selection is unnecessary and fills up the logs.
Test: as follows
- built
- flashed
- booted
- "runtest frameworks-net" passes
Bug:
32163131
Bug:
63250751
Merged-In: Id089375a5699ac1157fc5f445876fee558d7bc7e
Merged-In: I1fc87f9c2a31f7fd16889275e6ba197b2b48a264
Merged-In: Ia6276ada690aa3e4870bb83dc4bf3ddcddc35e7b
(cherry picked from commit
6ee73daa0aa90620e4b2cb13ead4b53d16f45010)
Change-Id: Ic51123e173cc29cfcb52210707f2a0f8d2ab2e3b
Erik Kline [Wed, 12 Jul 2017 06:46:54 +0000 (15:46 +0900)]
Add OffloadHardwareInterface.getForwardedStats() wrapper
Test: as follows
- built
- flashed
- booted
- "runtest frameworks-net" passes
Bug:
29337859
Bug:
32163131
Merged-In: I41f837e16eff9a4cd763d65155bd9b5d5d980acd
Merged-In: Id9766983a3bbd885ef0f0d3ba9e33de903939f2d
Merged-In: Id831bc99cadbd59d280b026866707dbbe3b0e542
(cherry picked from commit
9a5b02a89c02d5ff633d8456b22d3d5b7a15bd44)
Change-Id: I0752b6e2cf1e0b9a5075f7911408528538683c84
Treehugger Robot [Wed, 12 Jul 2017 06:06:07 +0000 (06:06 +0000)]
Merge "Restructure use of absent tether_offload_disabled setting"
Treehugger Robot [Wed, 12 Jul 2017 04:35:34 +0000 (04:35 +0000)]
Merge "Connectivity: Fix format arguments"
Erik Kline [Fri, 7 Jul 2017 08:38:30 +0000 (17:38 +0900)]
Restructure use of absent tether_offload_disabled setting
This restructures the fetching of the default disposition such
that we disable (and enable) the feature with only a single
character change.
Additionally: fix unittests with proper use of FakeSettingsProvider.
Test: as follows
- built
- flashed
- booted
- "runtest frameworks-net" passed with developer enabled and disabled
Bug:
29337859
Bug:
32163131
Bug:
63250751
(cherry picked from commit
c87cd411843484225897ebdf91cd05073c1c5f35)
Merged-In: Ib32489d07778465134bca52c589baddbd78ab129
Merged-In: I03d68b0da192fbd6172639343d4ab88c20127ad7
Merged-In: I10c0af2b2c4f6b6e613380e637cc3acb1f7a55a3
Change-Id: Ie16a022be8dacd76b0402bcb777680c36163a084
Di Lu [Wed, 12 Jul 2017 03:53:57 +0000 (03:53 +0000)]
Merge "Remove return value of ipSecAddSecurityAssociation"
Treehugger Robot [Wed, 12 Jul 2017 03:41:57 +0000 (03:41 +0000)]
Merge "Add first OWNERS files for core networking"
Treehugger Robot [Wed, 12 Jul 2017 02:43:14 +0000 (02:43 +0000)]
Merge "app_main: silence static analyzer warnings"
Andreas Gampe [Tue, 11 Jul 2017 22:14:41 +0000 (15:14 -0700)]
Connectivity: Fix format arguments
Fix missing argument.
Bug:
19797138
Test: m
Change-Id: I5fdd2a453c0d7422e8c3e79c8dce2d0800ec45e9
Treehugger Robot [Wed, 12 Jul 2017 01:17:19 +0000 (01:17 +0000)]
Merge "IpSecService: Actually throw exception"
Robert Quattlebaum [Wed, 12 Jul 2017 01:05:33 +0000 (18:05 -0700)]
NetworkCapabilities: Unhide TRANSPORT_LOWPAN
This commit simply unhides the constant `TRANSPORT_LOWPAN` in the class
`android.net.NetworkCapabilities`, adding it to the public API.
Bug: b/
63600204
Change-Id: I794635814c0bd3891cd22fcc1e31614e4d6ac654
George Burgess IV [Wed, 12 Jul 2017 00:18:26 +0000 (17:18 -0700)]
app_main: silence static analyzer warnings
This silences two warnings:
frameworks/base/cmds/app_process/app_main.cpp:238:11: warning: Potential
memory leak
frameworks/base/cmds/app_process/app_main.cpp:261:9: warning: Potential
memory leak
As the (existing) comment notes, we nuke argv later in main(), so these
copies are necessary. Since these args need to live for basically the
entire life of the process, it seems pointless to go out of our way to
free them.
Bug:
27101951
Test: mma. Static analyzer warnings are gone.
Change-Id: Icbfabfede9db909f6acb274b697cb6076c3fc11f
Hugo Benichi [Fri, 7 Jul 2017 02:55:41 +0000 (11:55 +0900)]
Add first OWNERS files for core networking
Covering
core/java/android/net/
core/java/com/android/server/net/
packages/CaptivePortalLogin/
services/core/java/com/android/server/
ConnectivityService.java
NsdServic.java
NetworkManagementService.java
services/core/java/com/android/server/connectivity/
services/net/
tests/net/
Android core networking files not covered:
services/core/jni/com_android_server_connectivity_tethering_OffloadHardwareInterface.cpp
services/core/proto/ipconnectivity.proto (path unique to aosp)
Bug:
63408147
Test: builds
Change-Id: Ifbb923d5ffdcada83864b5e0eb07911682d66efa
Andreas Gampe [Tue, 11 Jul 2017 17:25:09 +0000 (10:25 -0700)]
IpSecService: Actually throw exception
Add a missing throw.
Bug:
19797138
Test: m
Test: Device boots
Change-Id: I6c6058ecc95a5b85da43a42bac2846c31cefc038
Treehugger Robot [Tue, 11 Jul 2017 20:15:17 +0000 (20:15 +0000)]
Merge "GATT: Expose opportunistic client API to Java"
Jack He [Wed, 5 Jul 2017 21:55:35 +0000 (14:55 -0700)]
GATT: Expose opportunistic client API to Java
* Allow Java based programs to create an opportunistic GATT client
* Such client does not hold a GATT connection. It automatically
disconnects when no other GATT connections are active for the
remote device.
Bug:
63347806
Test: make, run battery service
Change-Id: Ib9333817d7f17a1fa3ddacfa51c680890bac19ec
Neil Fuller [Tue, 11 Jul 2017 14:25:48 +0000 (15:25 +0100)]
Address further API review comments
Address further API review comments from API reviewer.
Bug:
31008728
Test: make droid
Change-Id: I0b3f6be9eaf69ffa8a6e73475f9c3a9ba3e343f2
Neil Fuller [Tue, 11 Jul 2017 10:34:25 +0000 (11:34 +0100)]
Address post-commit review comments
Address post-commit review comments in PackageStatusStorage.java
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"
Test: See above.
Bug:
31008728
Change-Id: I3d9d1b1f40b0568629e58a13d1184add0fd1f0ac
Treehugger Robot [Tue, 11 Jul 2017 10:58:30 +0000 (10:58 +0000)]
Merge "Fix typo in Parcel javadoc."
Neil Fuller [Tue, 11 Jul 2017 10:01:01 +0000 (10:01 +0000)]
Merge "Move column definitions to an inner class"
Hugo Benichi [Tue, 11 Jul 2017 07:05:26 +0000 (07:05 +0000)]
Merge "Fix for the missing focus in WebView form fields."
susnata [Fri, 23 Jun 2017 16:13:05 +0000 (09:13 -0700)]
Fix for the missing focus in WebView form fields.
This looks like a regression for WebView (58.0.3029.125) in android
'O'. But this seems to have been fixed in early version of 60 (webview).
This workaround gets us past the problem, until we get the newer version
of WebView.
Bug:
62449959
Test: Manual
Change-Id: Iab22f8f0db0ab58cb0a184c3f88e6b3770a35fb0
Merged-In: I29883bf7d1567c1ce7be90b4efde4b3da93b99a2
(cherry pick from commit
97640400c4aa6bf05d5606ea749b54ad63de97cd)
Bin Chen [Tue, 11 Jul 2017 03:01:44 +0000 (11:01 +0800)]
Fix typo in Parcel javadoc.
Change-Id: Ida05259143e86c15c2ed69eeb7566d39b60fa823
Neil Fuller [Mon, 10 Jul 2017 18:18:01 +0000 (19:18 +0100)]
Move column definitions to an inner class
Move column definitions and other URI constants
to inner classes based on feedback from an API council
reviewer.
Bug:
31008728
Test: make droid
Change-Id: I213e44f2655017e0ca32a4dfb1f5617ef471d854
Neil Fuller [Mon, 10 Jul 2017 14:14:46 +0000 (14:14 +0000)]
Merge "Configure the package name of the updater app"
Treehugger Robot [Mon, 10 Jul 2017 12:15:47 +0000 (12:15 +0000)]
Merge "Make failure to set addrgenmode a non-fatal error."
Treehugger Robot [Mon, 10 Jul 2017 12:00:31 +0000 (12:00 +0000)]
Przemyslaw Szczepaniak [Tue, 4 Jul 2017 09:32:11 +0000 (10:32 +0100)]
Track libcore commit
2fd032687ba3d4d7f6af560482c5aba525584621
Test: Make
Bug:
62779247
Change-Id: I919df93b20e809f42a27225403e1549b763b0a60
Treehugger Robot [Mon, 10 Jul 2017 11:52:11 +0000 (11:52 +0000)]
Merge "Fix dumpsys output for staged install version"