OSDN Git Service
Hemant Gupta [Thu, 16 Feb 2017 13:10:19 +0000 (13:10 +0000)]
Merge "OBEX: Set Min maxPacketLength negotiated in CONNECT Operation."
am:
3ac3170a4b
Change-Id: I477f407d94a43a14083fa68a7b271f5d4fe8445d
Treehugger Robot [Thu, 16 Feb 2017 12:59:15 +0000 (12:59 +0000)]
Merge "OBEX: Set Min maxPacketLength negotiated in CONNECT Operation."
Shigeki Yokomichi [Thu, 16 Feb 2017 12:58:17 +0000 (12:58 +0000)]
Merge "Fix the "Alarm volume" icon is displayed incorrectly"
am:
e0ba81110a
Change-Id: Id7996cd16fea9eccbdcd389206e77d7390cd25a2
Treehugger Robot [Thu, 16 Feb 2017 12:47:41 +0000 (12:47 +0000)]
Merge "Fix the "Alarm volume" icon is displayed incorrectly"
Hugo Benichi [Thu, 16 Feb 2017 07:04:25 +0000 (07:04 +0000)]
Merge "Captive portal: better detect empty responses"
am:
c217f7a9f3
Change-Id: If6229a3a5c0ccc3575d44d11ed9f486cab35eac3
Hugo Benichi [Thu, 16 Feb 2017 06:54:46 +0000 (06:54 +0000)]
Merge "Captive portal: better detect empty responses"
Hugo Benichi [Wed, 11 Jan 2017 07:23:26 +0000 (16:23 +0900)]
Captive portal: better detect empty responses
The captive portal detection logic treats empty http responses with a
Content-Length of 0 as not coming from a portal.
However when the Content-Length is missing from the response header, the
empty response is not detected as such and is classified as a captive
portal answer.
When this happens for the http probe, the portal detection logic will
short circuit the detection and wrongly report a portal. The system
validates the network in such conditions only if the https probe
returns a successful connection faster than the http probe.
This patch attempts to better detect empty responses by trying to read
the first byte from the response body when the Content-Length is missing
for 200 responses.
Test: build, flashed + manual tests.
Bug:
33498325
(cherry picked from commit
cb4aa4d412c7940386df9b8dd681e0d2efebfd1d)
Change-Id: Ibb9914cba72a4dab3ae76746d8889bbf083be812
Hall Liu [Wed, 15 Feb 2017 22:24:23 +0000 (22:24 +0000)]
Merge "Add extra key for app-specified outgoing call timeout"
am:
decc6c9d56
Change-Id: I58a70b265f4b5af735e93c9004616bd44d5c51de
Hall Liu [Wed, 15 Feb 2017 21:41:21 +0000 (21:41 +0000)]
Merge "Add extra key for app-specified outgoing call timeout"
Badhri Jagan Sridharan [Wed, 15 Feb 2017 20:13:53 +0000 (20:13 +0000)]
Merge changes from topic 'dual_role_chargers'
am:
37b939a180
Change-Id: I2b9eda605ae85347eb2e3e4202a6c7ec176778af
Badhri Jagan Sridharan [Wed, 15 Feb 2017 20:00:24 +0000 (20:00 +0000)]
Merge changes from topic 'dual_role_chargers'
* changes:
Introduce debounce to filter rapidly toggling type-c ports
Fix handling usb dialog for wall chargers.
Badhri Jagan Sridharan [Fri, 10 Feb 2017 03:45:21 +0000 (19:45 -0800)]
Introduce debounce to filter rapidly toggling type-c ports
Type-c ports can quickly toggle between connected/disconnected
states. Introduce debounce to prevent sending spurious notifications.
Bug:
34972898
Test: notification should not be queued for a pixel-c charger not connected
to the power outlet.
Change-Id: I4aa19f9f864fe5b77e65f6a07a3184d8aba1f5fc
Badhri Jagan Sridharan [Mon, 13 Feb 2017 21:14:40 +0000 (13:14 -0800)]
Fix handling usb dialog for wall chargers.
UsbPort.POWER_ROLE_SINK is orthogonal to the type of the charger
attached. POWER_ROLE_SINK would be the case for AC charging and
USB charging. Therefore query BatteryManager for the charger
type.
Bug:
34972898
Test: Charging notification should not show for pixel-c chargers.
Change-Id: I8dddcd7727b6af973bd173d2c6e325aa4be2ca3a
Hall Liu [Wed, 15 Feb 2017 02:11:11 +0000 (18:11 -0800)]
Add extra key for app-specified outgoing call timeout
Bug:
34474757
Test: manual
Change-Id: Ia93d68d6a01308b0b93b88977daf983a0ed3a22c
Hugo Benichi [Wed, 15 Feb 2017 01:05:24 +0000 (01:05 +0000)]
Merge "ConnectivityManager: fix potential NPE"
am:
b688dd18ab
Change-Id: If562fc6a921569ad9d3141cac72b6f395a30da9e
Hugo Benichi [Wed, 15 Feb 2017 00:53:44 +0000 (00:53 +0000)]
Merge "ConnectivityManager: fix potential NPE"
Erik Kline [Wed, 15 Feb 2017 00:49:20 +0000 (00:49 +0000)]
Merge "Split chooseUpstreamType() into two separate functions"
am:
7a42d3ad83
Change-Id: I77649e11e74140ec985dcdadab226e3e73e67642
Erik Kline [Wed, 15 Feb 2017 00:48:24 +0000 (00:48 +0000)]
Merge "Slightly simplify mTryCell and requestUpstreamMobileConnection() usage"
am:
63445824d6
Change-Id: Ie921ee1a2f1dbdd338c9f0700b24808e1cb6435e
Erik Kline [Wed, 15 Feb 2017 00:38:50 +0000 (00:38 +0000)]
Merge "Split chooseUpstreamType() into two separate functions"
Erik Kline [Wed, 15 Feb 2017 00:38:31 +0000 (00:38 +0000)]
Merge "Slightly simplify mTryCell and requestUpstreamMobileConnection() usage"
Michael Peck [Tue, 14 Feb 2017 23:50:17 +0000 (23:50 +0000)]
Merge "Pass targetSdkVersion specifier for SELinux labeling"
am:
4516240b47
Change-Id: Ic61c4dc30f075d01a85d8b60cfe4ae1de773aa09
Treehugger Robot [Tue, 14 Feb 2017 23:42:57 +0000 (23:42 +0000)]
Merge "Pass targetSdkVersion specifier for SELinux labeling"
Colin Cross [Tue, 14 Feb 2017 19:10:18 +0000 (19:10 +0000)]
Merge "Use asm-5.2 prebuilt"
am:
6b32770d6d
Change-Id: I7dc856be1a10ea7a65c7b3f889b37d9afaadbd5c
Colin Cross [Tue, 14 Feb 2017 19:03:45 +0000 (19:03 +0000)]
Merge "Use asm-5.2 prebuilt"
Michael Peck [Tue, 14 Feb 2017 17:07:04 +0000 (09:07 -0800)]
Pass targetSdkVersion specifier for SELinux labeling
Motivation:
Provide the ability to phase in new security policies by
applying them to apps with a minimum targetSdkVersion
Test: Marlin builds and boots. Apps targeting targetSdkVersion<=25
run in untrusted_app_25 domain. Apps targeting the current development
build >=26 run in the untrusted_app domain with fewer permissions. No
new denials observed during testing.
Bug:
34115651
Change-Id: Ib9f6ded9bd2f426861a6d843861b4074084253b0
Orion Hodson [Tue, 14 Feb 2017 16:07:28 +0000 (16:07 +0000)]
Merge "Import CallSite classes and BootstrapMethodError class from ojdk8u60"
am:
3023906b1b
Change-Id: If332034df3b7afac1f7fdb92ca40adfb420ba768
Orion Hodson [Tue, 14 Feb 2017 16:02:32 +0000 (16:02 +0000)]
Merge "Import CallSite classes and BootstrapMethodError class from ojdk8u60"
songjinshi [Tue, 14 Feb 2017 14:29:36 +0000 (14:29 +0000)]
Merge "[NotificationManagerService]: Fixes the thread-safe issue."
am:
d530d1bf18
Change-Id: I661207bb52d84b1928d7ff3ad262cfe89e71e60b
Treehugger Robot [Tue, 14 Feb 2017 14:23:18 +0000 (14:23 +0000)]
Merge "[NotificationManagerService]: Fixes the thread-safe issue."
Erik Kline [Tue, 14 Feb 2017 10:03:09 +0000 (19:03 +0900)]
Split chooseUpstreamType() into two separate functions
Test: as follows
- built (bullhead)
- flashed
- booted
- runtest frameworks-net passes
Bug:
32163131
Change-Id: If892864ff59a6f38340791597c2d9e5b4022bbfa
Erik Kline [Tue, 14 Feb 2017 09:26:04 +0000 (18:26 +0900)]
Slightly simplify mTryCell and requestUpstreamMobileConnection() usage
Test: as follows
- built (bullhead)
- flashed
- booted
- runtest frameworks-net passes
Bug:
32163131
Change-Id: I46fbd176a71e61552d7d92660c1debe6487a1edf
Erik Kline [Tue, 14 Feb 2017 09:41:53 +0000 (09:41 +0000)]
Merge "Verify duplicate upstream notifications are ignored"
am:
3d57eb0bdc
Change-Id: Iff84a1a12714047b20408f03e3bb2252a463b74b
Treehugger Robot [Tue, 14 Feb 2017 09:32:55 +0000 (09:32 +0000)]
Merge "Verify duplicate upstream notifications are ignored"
Hugo Benichi [Fri, 3 Feb 2017 05:18:44 +0000 (14:18 +0900)]
ConnectivityManager: fix potential NPE
ConnectivityManager static sCallbackHandler is referenced and directly
used in a way that is not ensuring its proper initialization.
This patch fixes this potential NPE by using getHandler() instead.
Also this patch changes sendRequestForNetwork's signature to only accept
the subtype CallbackHandler instead of Handler: without using
CallbackHandler the NetworkCallbacks are not triggered properly and
bookkeeping of sCallbacks does not happen. sendRequestForNetwork's
signature now makes this explicit.
This step prepares the addition of overloaded versions of
registerNetworkCallback and cie that takes custom Handlers.
Test: build, flashed, manually checked connectivity
Change-Id: I52e8a2cb5075e7aef7b35e30c9845cacba927d13
Erik Kline [Tue, 14 Feb 2017 06:55:00 +0000 (15:55 +0900)]
Verify duplicate upstream notifications are ignored
Test: as follows
- built (bullhead)
- flashed
- booted
- runtest .../tethering/TetherInterfaceStateMachineTest.java passes
Bug:
32163131
Change-Id: I3c097d766fe4c416a8e3f02640809fe1199c6ef2
Erik Kline [Tue, 14 Feb 2017 06:17:38 +0000 (06:17 +0000)]
Merge "Cleanup in the face of upstream error"
am:
ed6d75d5f3
Change-Id: If8dbf882bd8c4a8d53ae026d8f83a00a52590830
Erik Kline [Tue, 14 Feb 2017 06:09:21 +0000 (06:09 +0000)]
Merge "Cleanup in the face of upstream error"
Erik Kline [Mon, 13 Feb 2017 08:28:53 +0000 (17:28 +0900)]
Cleanup in the face of upstream error
If either enableNat() or startInterfaceForwarding() fail, be sure
to cleanup any commands that might have succeeded.
Most of this change is a refactoring of cleanupUpstreamIface() into
two methods, one of which (cleanupUpstreamInterface()) is reused
in error handling scenarios.
Test: as follows
- built (bullhead)
- flashed
- booted
- runtest -x .../tethering/TetherInterfaceStateMachineTest.java passes
Bug:
32031803
Bug:
32163131
Change-Id: Ia4d56e03beeab1908d8b8c2202e94992f1aa58a4
Ningyuan Wang [Tue, 14 Feb 2017 02:20:23 +0000 (02:20 +0000)]
Merge "Create createFromByteArray() for WifiSsid"
am:
fb19d8d7c1
Change-Id: I8b88c2259950b81b452452a2b56fd0ceaf2b7180
Ningyuan Wang [Tue, 14 Feb 2017 02:13:33 +0000 (02:13 +0000)]
Merge "Create createFromByteArray() for WifiSsid"
Chen Xu [Tue, 14 Feb 2017 01:34:02 +0000 (01:34 +0000)]
Merge "Add simActivationState to PhoneStateListener"
am:
132842efc9
Change-Id: I0b35d7d8f5b6237ff55aaab0cab0b86d75699a7a
Chen Xu [Tue, 14 Feb 2017 01:26:18 +0000 (01:26 +0000)]
Merge "Add simActivationState to PhoneStateListener"
Ningyuan Wang [Mon, 13 Feb 2017 19:26:15 +0000 (11:26 -0800)]
Create createFromByteArray() for WifiSsid
Bug:
35318006
Test: compile, unit tests
Change-Id: I0138bd67c0dec37419897318401b18ee4445a111
Colin Cross [Mon, 13 Feb 2017 20:14:29 +0000 (12:14 -0800)]
Use asm-5.2 prebuilt
Test: m -j checkbuild tests cts
Change-Id: I37d40cc2e0406679394012aacd49f7ca9e51e3f6
Peter Qiu [Mon, 13 Feb 2017 20:02:06 +0000 (20:02 +0000)]
Merge "hotspot2: fix typo in the getter functions"
am:
d3146f3c3c
Change-Id: I8fc4042c26f896d899c090dd7afbe16a44d431eb
Treehugger Robot [Mon, 13 Feb 2017 19:49:50 +0000 (19:49 +0000)]
Merge "hotspot2: fix typo in the getter functions"
Erik Kline [Mon, 13 Feb 2017 11:57:37 +0000 (11:57 +0000)]
Merge "Add test coverage for cleanup bug to be fixed."
am:
89e6bf0532
Change-Id: I33347c8fc2bec5660b8e9c14a316f6d14a6cf8b1
Treehugger Robot [Mon, 13 Feb 2017 11:51:20 +0000 (11:51 +0000)]
Merge "Add test coverage for cleanup bug to be fixed."
Erik Kline [Mon, 13 Feb 2017 08:12:02 +0000 (17:12 +0900)]
Add test coverage for cleanup bug to be fixed.
The test calls that need to pass but do not currently are commented out.
Test: as follows
- built (bullhead)
- flashed
- booted
- runtest -x .../tethering/TetherInterfaceStateMachineTest.java passes
Bug:
32031803
Bug:
32163131
Change-Id: I68ed476920bef882f353d8e8a54c72120bc27002
fionaxu [Mon, 14 Nov 2016 21:32:14 +0000 (13:32 -0800)]
Add simActivationState to PhoneStateListener
- new public SimActivationState
- hook with PhoneStateListener, notifying registrants when voice&data
activation state changed
Bug:
31061369
Test: existing TC runtest --path frameworks/opt/telephony/tests/telephonytests
Test: new TC runtest --path
frameworks/opt/telephony/tests/telephonytests/src/com/android/internal/telephony/SimActivationTrackerTest.java
Merged-in: CHANGE-ID Ieefe2698fe6055a980d225f5ce74f52aef0daab4
Change-Id: Iac6418f66c9dad44dc7272ab19aa87f3eef232f8
Paul Stewart [Sat, 11 Feb 2017 02:43:38 +0000 (02:43 +0000)]
Merge "Allow EAP-SIM authentication methods under PEAP"
am:
e690e0178c
Change-Id: I3f61bdd86c97210acd14b6d2d30e44e26c8b1085
Treehugger Robot [Sat, 11 Feb 2017 02:34:50 +0000 (02:34 +0000)]
Merge "Allow EAP-SIM authentication methods under PEAP"
Paul Stewart [Wed, 25 Jan 2017 22:12:14 +0000 (14:12 -0800)]
Allow EAP-SIM authentication methods under PEAP
Extend the PEAP outer method to contain EAP-SIM innner methods
so these transactions can be encrypted.
Cherry-pick of
68c63024c2ace87921c1e84a99d18dae6001c74c
Bug:
34835771
Test: Unit tests
Change-Id: I4931ed43e396c93bad0bfce1750291982f8cd146
Paul Lawrence [Fri, 10 Feb 2017 21:17:14 +0000 (21:17 +0000)]
Merge "Expand seccomp whitelist"
am:
c6c11723cb
Change-Id: I73a7ede13a35354a08e1bc3301f624295373cd52
Treehugger Robot [Fri, 10 Feb 2017 21:08:05 +0000 (21:08 +0000)]
Merge "Expand seccomp whitelist"
Yifan Hong [Fri, 10 Feb 2017 18:43:37 +0000 (18:43 +0000)]
Merge "android.os.HwBinder.getService() in Java respects VINTF."
am:
01f374c635
Change-Id: I1db3c946211861e6edd7c03d9eaeae7a0cb412c4
Paul Lawrence [Fri, 10 Feb 2017 18:07:48 +0000 (10:07 -0800)]
Expand seccomp whitelist
Bug:
34763393
Test: cts test android.os.cts.SeccompTest now passes
Change-Id: I8907074485395015a03119700543ff33fdd8e214
Yifan Hong [Fri, 10 Feb 2017 18:33:41 +0000 (18:33 +0000)]
Merge "android.os.HwBinder.getService() in Java respects VINTF."
Sooraj Sasindran [Fri, 10 Feb 2017 05:45:05 +0000 (05:45 +0000)]
Merge "Expose api to retrieve wakelock information per client"
am:
8fbf6a29d0
Change-Id: I1ca7d53b256333170b849cb1103c8b3ca0e76e0b
Sooraj Sasindran [Fri, 10 Feb 2017 05:38:40 +0000 (05:38 +0000)]
Merge "Expose api to retrieve wakelock information per client"
Andreas Gampe [Fri, 10 Feb 2017 00:54:55 +0000 (00:54 +0000)]
Merge "Framework: Clean up RuntimeInit/ZygoteInit/WrapperInit"
am:
851afe56b8
Change-Id: Ib21530d511158635793f6180d53f193d1f1b0d95
Treehugger Robot [Fri, 10 Feb 2017 00:45:55 +0000 (00:45 +0000)]
Merge "Framework: Clean up RuntimeInit/ZygoteInit/WrapperInit"
Sooraj Sasindran [Mon, 18 Jul 2016 18:50:50 +0000 (11:50 -0700)]
Expose api to retrieve wakelock information per client
Expose api to retrieve wakelock information per client
Provide calling package name in cell info apis
BUG=
31041780
Merged-In: Ie39fe59055eb7931bd179dd9e2537a7552c38af8
Change-Id: Ie39fe59055eb7931bd179dd9e2537a7552c38af8
Andreas Gampe [Wed, 8 Feb 2017 03:44:37 +0000 (19:44 -0800)]
Framework: Clean up RuntimeInit/ZygoteInit/WrapperInit
Move methods where they belong.
Test: m
Test: Device boots
Merged-In: I805c6493078e960ff5b70d84dd93d2da6c7aa797
Change-Id: I805c6493078e960ff5b70d84dd93d2da6c7aa797
Paul Duffin [Thu, 9 Feb 2017 19:28:25 +0000 (19:28 +0000)]
Merge "Partial Revert "Replace com.android.internal.util.Predicate with java.util.function.Predicate""
am:
621ebe692f
Change-Id: Ifc6e7ac4f4a1bfc8c592d3b956ac985e9dd6e0ea
Paul Duffin [Thu, 9 Feb 2017 19:18:34 +0000 (19:18 +0000)]
Merge "Partial Revert "Replace com.android.internal.util.Predicate with java.util.function.Predicate""
Paul Duffin [Thu, 9 Feb 2017 14:47:53 +0000 (14:47 +0000)]
Partial Revert "Replace com.android.internal.util.Predicate with java.util.function.Predicate"
This partially reverts commit
3e5fbca0c57742f28f5c7e6bda6c3500b9471b47.
Bug:
35187548
Bug:
30188076
Bug:
35089332
Test: make checkbuild
Change-Id: I7ab4279aab604e3d56003b0a59867948aebabd28
Martijn Coenen [Thu, 9 Feb 2017 08:42:27 +0000 (08:42 +0000)]
Merge "Don't generate and send reply object in oneway calls."
am:
60f11f3d16
Change-Id: I790576158c1d2cae6b746f3b5d0dbecad750629a
Martijn Coenen [Thu, 9 Feb 2017 08:37:29 +0000 (08:37 +0000)]
Merge "Don't generate and send reply object in oneway calls."
Martijn Coenen [Wed, 8 Feb 2017 09:22:28 +0000 (10:22 +0100)]
Don't generate and send reply object in oneway calls.
Bug:
35044790
Test: hidl_test, hidl_test_java
Change-Id: Iae8f5b071f89d2af5ca15360c6a1a0fbf8040e77
Tyler Gunn [Wed, 8 Feb 2017 21:56:39 +0000 (21:56 +0000)]
Merge "Change prototype for "setCamera" in IMS VideoProvider."
am:
c164b159f8
Change-Id: I3abbb1de951f65c226a6849f34946880e9f650ff
Treehugger Robot [Wed, 8 Feb 2017 21:46:43 +0000 (21:46 +0000)]
Merge "Change prototype for "setCamera" in IMS VideoProvider."
Peter Qiu [Wed, 8 Feb 2017 18:39:21 +0000 (10:39 -0800)]
hotspot2: fix typo in the getter functions
Bug:
34862444
Test: frameworks/base/wifi/tests/runtests.sh
Test: frameworks/opt/net/wifi/tests/wifitests/runtests.sh
Change-Id: If833fb06cead7df9d631b3b12d66d05b8422d46c
Merged-In: If833fb06cead7df9d631b3b12d66d05b8422d46c
Roshan Pius [Wed, 8 Feb 2017 20:50:02 +0000 (20:50 +0000)]
Merge changes If970d851,I5bd11574
am:
3c054697fc
Change-Id: I2794ca0e7dfaaf10a47862a4646483772a530b5e
Roshan Pius [Wed, 8 Feb 2017 20:49:57 +0000 (20:49 +0000)]
WifiManager: API upates for O
am:
fb441f5009
Change-Id: I00207a5219d97c49b1231610ad78f7ec4cbe0b96
Roshan Pius [Wed, 8 Feb 2017 20:49:13 +0000 (20:49 +0000)]
WifiConfiguration: Remove priority field
am:
45491113ed
Change-Id: I2dd6f7f7b1912259b646a715049164b48334d5b4
Treehugger Robot [Wed, 8 Feb 2017 20:38:12 +0000 (20:38 +0000)]
Merge changes If970d851,I5bd11574
* changes:
WifiManager: API upates for O
WifiConfiguration: Remove priority field
songjinshi [Wed, 8 Feb 2017 20:18:13 +0000 (20:18 +0000)]
Merge "[Debug]: Add timeout for dumpNativeBacktraceToFile."
am:
b6f7a85b85
Change-Id: Iea79127b2c7d823844406f677a98fea54043f4cb
Treehugger Robot [Wed, 8 Feb 2017 20:11:22 +0000 (20:11 +0000)]
Merge "[Debug]: Add timeout for dumpNativeBacktraceToFile."
Paul Duffin [Wed, 8 Feb 2017 18:14:50 +0000 (18:14 +0000)]
Merge "Replace com.android.internal.util.Predicate with java.util.function.Predicate"
am:
78a20be77a
Change-Id: I6f32dc27f70e4c22d25ec6bd2eec715700ebbd89
Paul Lawrence [Wed, 8 Feb 2017 18:10:28 +0000 (18:10 +0000)]
Merge "Expand seccomp whitelist"
am:
fd77a331eb
Change-Id: I824c984b907e43248d6eba6259f31f4aab7d64db
Paul Duffin [Wed, 8 Feb 2017 18:06:07 +0000 (18:06 +0000)]
Merge "Replace com.android.internal.util.Predicate with java.util.function.Predicate"
Paul Lawrence [Wed, 8 Feb 2017 17:57:41 +0000 (17:57 +0000)]
Merge "Expand seccomp whitelist"
Tyler Gunn [Wed, 8 Feb 2017 17:17:30 +0000 (17:17 +0000)]
Merge "Add support for wait-on-handlers command."
am:
da6d683caa
Change-Id: I71bee35ec1bf6ff4100f6515ea87dcc89312a689
Roshan Pius [Fri, 3 Feb 2017 20:51:40 +0000 (12:51 -0800)]
WifiManager: API upates for O
Deprecate the following API's:
1. pingSupplicant() - We don't want apps trying to figure out if
wpa_supplicant is running or not. It should not be something that
apps need to know.
2. saveConfiguration() - No longer needed, we automatically persist data
when needed.
Other changes:
1. Reworded the docstrings to remove direct reference to wpa_supplicant
for network configuration related API's.
2. We no longer allow apps to modfiy network configuration of other
apps. Added a docstring explaining that in the 3 modify API's.
3. Changed the wording of enableNetwork's |disableOthers| flag.
Bug:
31146757
Test: make update-api
Change-Id: If970d85146de3532072191cb2b7ecb0d5adb2774
Roshan Pius [Tue, 24 Jan 2017 22:58:34 +0000 (14:58 -0800)]
WifiConfiguration: Remove priority field
This field is no longer used anywhere within wifi framework and hence
removing this from public API.
Bug:
28341078
Test: make update-api
Change-Id: I5bd115742ca610735b00c20f2ffab7590c5f3256
Paul Lawrence [Wed, 8 Feb 2017 16:26:56 +0000 (08:26 -0800)]
Expand seccomp whitelist
Bug:
35059702
Test: Device boots, app no longer produces SIGSYS failures
Change-Id: I020b625bd7529ad9806c0b23a1ca70bc87906dad
Tyler Gunn [Wed, 8 Feb 2017 16:09:09 +0000 (16:09 +0000)]
Merge "Add support for wait-on-handlers command."
Paul Duffin [Wed, 8 Feb 2017 11:31:15 +0000 (11:31 +0000)]
Merge "Fix problem with JavaDoc"
am:
8f33fcdc4b
Change-Id: I25fd01b35a2c1299304401a1333f737ee9252317
Treehugger Robot [Wed, 8 Feb 2017 11:21:28 +0000 (11:21 +0000)]
Merge "Fix problem with JavaDoc"
Paul Duffin [Wed, 8 Feb 2017 09:14:46 +0000 (09:14 +0000)]
Fix problem with JavaDoc
Test: make checkbuild
Change-Id: Ia321e0a57ff63aa62adee16d611c063a22807176
songjinshi [Sat, 4 Feb 2017 02:47:45 +0000 (10:47 +0800)]
[NotificationManagerService]: Fixes the thread-safe issue.
Add missed sync for backup realted access.
https://code.google.com/p/android/issues/detail?id=233435
Change-Id: I8499f79f491cec545d348bc9c3204aa79ccb6706
Signed-off-by: songjinshi <songjinshi@xiaomi.com>
Tyler Gunn [Wed, 30 Nov 2016 23:14:26 +0000 (15:14 -0800)]
Change prototype for "setCamera" in IMS VideoProvider.
Changing "setCamera" prototype to include the uid.
Test: Unit test, manual test.
Bug:
32747443
Merged-In: I7e6eb617d724972b0fcbd2f9a27f5c3ee91efd2d
Change-Id: I7e6eb617d724972b0fcbd2f9a27f5c3ee91efd2d
Peter Qiu [Tue, 7 Feb 2017 23:38:35 +0000 (23:38 +0000)]
Merge changes from topic 'Passpoint API Rename'
am:
93d66c83cf
Change-Id: Ibff6d79c8ca51b760932909e89b21e8c843acc89
Peter Qiu [Tue, 7 Feb 2017 23:32:08 +0000 (23:32 +0000)]
hotspot2: expose Passpoint APIs as public
am:
bffe405e1f
Change-Id: I86065439f5902b6ce7b0ceec3f295e14f0dff47f
Peter Qiu [Tue, 7 Feb 2017 23:31:02 +0000 (23:31 +0000)]
hotspot2: fix class/function/variable names to comply with API guideline
am:
da8a67e8a6
Change-Id: I48f7b3ab747c0323aec5208c7a0afa123ff68729
Peter Qiu [Tue, 7 Feb 2017 23:30:19 +0000 (23:30 +0000)]
hotspot2: rename classes to comply with API guideline
am:
a77809766c
Change-Id: Iaaf34a5ec744775e472d1b3eb8673ebf610b1c61
Treehugger Robot [Tue, 7 Feb 2017 23:25:02 +0000 (23:25 +0000)]
Merge changes from topic 'Passpoint API Rename'
* changes:
hotspot2: expose Passpoint APIs as public
hotspot2: fix class/function/variable names to comply with API guideline
hotspot2: rename classes to comply with API guideline
Paul Lawrence [Tue, 7 Feb 2017 22:59:34 +0000 (22:59 +0000)]
Merge "Expand seccomp whitelist"
am:
10e7aed13f
Change-Id: I8060b31a8ac20ddd77b7139c5a3bbd8d146dbc27
Paul Lawrence [Tue, 7 Feb 2017 22:50:43 +0000 (22:50 +0000)]
Merge "Expand seccomp whitelist"
OSDN Git Service
