OSDN Git Service

android-x86/frameworks-base.git
7 years agoMerge "ConnectivityManager: fix potential NPE"
Hugo Benichi [Wed, 15 Feb 2017 01:05:24 +0000 (01:05 +0000)]
Merge "ConnectivityManager: fix potential NPE"
am: b688dd18ab

Change-Id: If562fc6a921569ad9d3141cac72b6f395a30da9e

7 years agoMerge "ConnectivityManager: fix potential NPE"
Hugo Benichi [Wed, 15 Feb 2017 00:53:44 +0000 (00:53 +0000)]
Merge "ConnectivityManager: fix potential NPE"

7 years agoMerge "Split chooseUpstreamType() into two separate functions"
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

7 years agoMerge "Slightly simplify mTryCell and requestUpstreamMobileConnection() usage"
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

7 years agoMerge "Split chooseUpstreamType() into two separate functions"
Erik Kline [Wed, 15 Feb 2017 00:38:50 +0000 (00:38 +0000)]
Merge "Split chooseUpstreamType() into two separate functions"

7 years agoMerge "Slightly simplify mTryCell and requestUpstreamMobileConnection() usage"
Erik Kline [Wed, 15 Feb 2017 00:38:31 +0000 (00:38 +0000)]
Merge "Slightly simplify mTryCell and requestUpstreamMobileConnection() usage"

7 years agoMerge "Pass targetSdkVersion specifier for SELinux labeling"
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

7 years agoMerge "Pass targetSdkVersion specifier for SELinux labeling"
Treehugger Robot [Tue, 14 Feb 2017 23:42:57 +0000 (23:42 +0000)]
Merge "Pass targetSdkVersion specifier for SELinux labeling"

7 years agoMerge "Use asm-5.2 prebuilt"
Colin Cross [Tue, 14 Feb 2017 19:10:18 +0000 (19:10 +0000)]
Merge "Use asm-5.2 prebuilt"
am: 6b32770d6d

Change-Id: I7dc856be1a10ea7a65c7b3f889b37d9afaadbd5c

7 years agoMerge "Use asm-5.2 prebuilt"
Colin Cross [Tue, 14 Feb 2017 19:03:45 +0000 (19:03 +0000)]
Merge "Use asm-5.2 prebuilt"

7 years agoPass targetSdkVersion specifier for SELinux labeling
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

7 years agoMerge "Import CallSite classes and BootstrapMethodError class from ojdk8u60"
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

7 years agoMerge "Import CallSite classes and BootstrapMethodError class from ojdk8u60"
Orion Hodson [Tue, 14 Feb 2017 16:02:32 +0000 (16:02 +0000)]
Merge "Import CallSite classes and BootstrapMethodError class from ojdk8u60"

7 years agoMerge "[NotificationManagerService]: Fixes the thread-safe issue."
songjinshi [Tue, 14 Feb 2017 14:29:36 +0000 (14:29 +0000)]
Merge "[NotificationManagerService]: Fixes the thread-safe issue."
am: d530d1bf18

Change-Id: I661207bb52d84b1928d7ff3ad262cfe89e71e60b

7 years agoMerge "[NotificationManagerService]: Fixes the thread-safe issue."
Treehugger Robot [Tue, 14 Feb 2017 14:23:18 +0000 (14:23 +0000)]
Merge "[NotificationManagerService]: Fixes the thread-safe issue."

7 years agoSplit chooseUpstreamType() into two separate functions
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

7 years agoSlightly simplify mTryCell and requestUpstreamMobileConnection() usage
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

7 years agoMerge "Verify duplicate upstream notifications are ignored"
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

7 years agoMerge "Verify duplicate upstream notifications are ignored"
Treehugger Robot [Tue, 14 Feb 2017 09:32:55 +0000 (09:32 +0000)]
Merge "Verify duplicate upstream notifications are ignored"

7 years agoConnectivityManager: fix potential NPE
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

7 years agoVerify duplicate upstream notifications are ignored
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

7 years agoMerge "Cleanup in the face of upstream error"
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

7 years agoMerge "Cleanup in the face of upstream error"
Erik Kline [Tue, 14 Feb 2017 06:09:21 +0000 (06:09 +0000)]
Merge "Cleanup in the face of upstream error"

7 years agoCleanup 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

7 years agoMerge "Create createFromByteArray() for WifiSsid"
Ningyuan Wang [Tue, 14 Feb 2017 02:20:23 +0000 (02:20 +0000)]
Merge "Create createFromByteArray() for WifiSsid"
am: fb19d8d7c1

Change-Id: I8b88c2259950b81b452452a2b56fd0ceaf2b7180

7 years agoMerge "Create createFromByteArray() for WifiSsid"
Ningyuan Wang [Tue, 14 Feb 2017 02:13:33 +0000 (02:13 +0000)]
Merge "Create createFromByteArray() for WifiSsid"

7 years agoMerge "Add simActivationState to PhoneStateListener"
Chen Xu [Tue, 14 Feb 2017 01:34:02 +0000 (01:34 +0000)]
Merge "Add simActivationState to PhoneStateListener"
am: 132842efc9

Change-Id: I0b35d7d8f5b6237ff55aaab0cab0b86d75699a7a

7 years agoMerge "Add simActivationState to PhoneStateListener"
Chen Xu [Tue, 14 Feb 2017 01:26:18 +0000 (01:26 +0000)]
Merge "Add simActivationState to PhoneStateListener"

7 years agoCreate createFromByteArray() for WifiSsid
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

7 years agoUse asm-5.2 prebuilt
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

7 years agoMerge "hotspot2: fix typo in the getter functions"
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

7 years agoMerge "hotspot2: fix typo in the getter functions"
Treehugger Robot [Mon, 13 Feb 2017 19:49:50 +0000 (19:49 +0000)]
Merge "hotspot2: fix typo in the getter functions"

7 years agoMerge "Add test coverage for cleanup bug to be fixed."
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

7 years agoMerge "Add test coverage for cleanup bug to be fixed."
Treehugger Robot [Mon, 13 Feb 2017 11:51:20 +0000 (11:51 +0000)]
Merge "Add test coverage for cleanup bug to be fixed."

7 years agoAdd 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

7 years agoAdd simActivationState to PhoneStateListener
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

7 years agoMerge "Allow EAP-SIM authentication methods under PEAP"
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

7 years agoMerge "Allow EAP-SIM authentication methods under PEAP"
Treehugger Robot [Sat, 11 Feb 2017 02:34:50 +0000 (02:34 +0000)]
Merge "Allow EAP-SIM authentication methods under PEAP"

7 years agoAllow 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

7 years agoMerge "Expand seccomp whitelist"
Paul Lawrence [Fri, 10 Feb 2017 21:17:14 +0000 (21:17 +0000)]
Merge "Expand seccomp whitelist"
am: c6c11723cb

Change-Id: I73a7ede13a35354a08e1bc3301f624295373cd52

7 years agoMerge "Expand seccomp whitelist"
Treehugger Robot [Fri, 10 Feb 2017 21:08:05 +0000 (21:08 +0000)]
Merge "Expand seccomp whitelist"

7 years agoMerge "android.os.HwBinder.getService() in Java respects VINTF."
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

7 years agoExpand seccomp whitelist
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

7 years agoMerge "android.os.HwBinder.getService() in Java respects VINTF."
Yifan Hong [Fri, 10 Feb 2017 18:33:41 +0000 (18:33 +0000)]
Merge "android.os.HwBinder.getService() in Java respects VINTF."

7 years agoMerge "Expose api to retrieve wakelock information per client"
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

7 years agoMerge "Expose api to retrieve wakelock information per client"
Sooraj Sasindran [Fri, 10 Feb 2017 05:38:40 +0000 (05:38 +0000)]
Merge "Expose api to retrieve wakelock information per client"

7 years agoMerge "Framework: Clean up RuntimeInit/ZygoteInit/WrapperInit"
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

7 years agoMerge "Framework: Clean up RuntimeInit/ZygoteInit/WrapperInit"
Treehugger Robot [Fri, 10 Feb 2017 00:45:55 +0000 (00:45 +0000)]
Merge "Framework: Clean up RuntimeInit/ZygoteInit/WrapperInit"

7 years agoExpose api to retrieve wakelock information per client
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

7 years agoFramework: Clean up RuntimeInit/ZygoteInit/WrapperInit
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

7 years agoMerge "Partial Revert "Replace com.android.internal.util.Predicate with java.util...
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

7 years agoMerge "Partial Revert "Replace com.android.internal.util.Predicate with java.util...
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""

7 years agoPartial Revert "Replace com.android.internal.util.Predicate with java.util.function...
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

7 years agoMerge "Don't generate and send reply object in oneway calls."
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

7 years agoMerge "Don't generate and send reply object in oneway calls."
Martijn Coenen [Thu, 9 Feb 2017 08:37:29 +0000 (08:37 +0000)]
Merge "Don't generate and send reply object in oneway calls."

7 years agoDon'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

7 years agoMerge "Change prototype for "setCamera" in IMS VideoProvider."
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

7 years agoMerge "Change prototype for "setCamera" in IMS VideoProvider."
Treehugger Robot [Wed, 8 Feb 2017 21:46:43 +0000 (21:46 +0000)]
Merge "Change prototype for "setCamera" in IMS VideoProvider."

7 years agohotspot2: fix typo in the getter functions
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

7 years agoMerge changes If970d851,I5bd11574
Roshan Pius [Wed, 8 Feb 2017 20:50:02 +0000 (20:50 +0000)]
Merge changes If970d851,I5bd11574
am: 3c054697fc

Change-Id: I2794ca0e7dfaaf10a47862a4646483772a530b5e

7 years agoWifiManager: API upates for O
Roshan Pius [Wed, 8 Feb 2017 20:49:57 +0000 (20:49 +0000)]
WifiManager: API upates for O
am: fb441f5009

Change-Id: I00207a5219d97c49b1231610ad78f7ec4cbe0b96

7 years agoWifiConfiguration: Remove priority field
Roshan Pius [Wed, 8 Feb 2017 20:49:13 +0000 (20:49 +0000)]
WifiConfiguration: Remove priority field
am: 45491113ed

Change-Id: I2dd6f7f7b1912259b646a715049164b48334d5b4

7 years agoMerge changes If970d851,I5bd11574
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

7 years agoMerge "[Debug]: Add timeout for dumpNativeBacktraceToFile."
songjinshi [Wed, 8 Feb 2017 20:18:13 +0000 (20:18 +0000)]
Merge "[Debug]: Add timeout for dumpNativeBacktraceToFile."
am: b6f7a85b85

Change-Id: Iea79127b2c7d823844406f677a98fea54043f4cb

7 years agoMerge "[Debug]: Add timeout for dumpNativeBacktraceToFile."
Treehugger Robot [Wed, 8 Feb 2017 20:11:22 +0000 (20:11 +0000)]
Merge "[Debug]: Add timeout for dumpNativeBacktraceToFile."

7 years agoMerge "Replace com.android.internal.util.Predicate with java.util.function.Predicate"
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

7 years agoMerge "Expand seccomp whitelist"
Paul Lawrence [Wed, 8 Feb 2017 18:10:28 +0000 (18:10 +0000)]
Merge "Expand seccomp whitelist"
am: fd77a331eb

Change-Id: I824c984b907e43248d6eba6259f31f4aab7d64db

7 years agoMerge "Replace com.android.internal.util.Predicate with java.util.function.Predicate"
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"

7 years agoMerge "Expand seccomp whitelist"
Paul Lawrence [Wed, 8 Feb 2017 17:57:41 +0000 (17:57 +0000)]
Merge "Expand seccomp whitelist"

7 years agoMerge "Add support for wait-on-handlers command."
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

7 years agoWifiManager: API upates for O
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

7 years agoWifiConfiguration: Remove priority field
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

7 years agoExpand seccomp whitelist
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

7 years agoMerge "Add support for wait-on-handlers command."
Tyler Gunn [Wed, 8 Feb 2017 16:09:09 +0000 (16:09 +0000)]
Merge "Add support for wait-on-handlers command."

7 years agoMerge "Fix problem with JavaDoc"
Paul Duffin [Wed, 8 Feb 2017 11:31:15 +0000 (11:31 +0000)]
Merge "Fix problem with JavaDoc"
am: 8f33fcdc4b

Change-Id: I25fd01b35a2c1299304401a1333f737ee9252317

7 years agoMerge "Fix problem with JavaDoc"
Treehugger Robot [Wed, 8 Feb 2017 11:21:28 +0000 (11:21 +0000)]
Merge "Fix problem with JavaDoc"

7 years agoFix 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

7 years ago[NotificationManagerService]: Fixes the thread-safe issue.
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>
7 years agoChange prototype for "setCamera" in IMS VideoProvider.
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

7 years agoMerge changes from topic 'Passpoint API Rename'
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

7 years agohotspot2: expose Passpoint APIs as public
Peter Qiu [Tue, 7 Feb 2017 23:32:08 +0000 (23:32 +0000)]
hotspot2: expose Passpoint APIs as public
am: bffe405e1f

Change-Id: I86065439f5902b6ce7b0ceec3f295e14f0dff47f

7 years agohotspot2: fix class/function/variable names to comply with API guideline
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

7 years agohotspot2: rename classes to comply with API guideline
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

7 years agoMerge changes from topic 'Passpoint API Rename'
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

7 years agoMerge "Expand seccomp whitelist"
Paul Lawrence [Tue, 7 Feb 2017 22:59:34 +0000 (22:59 +0000)]
Merge "Expand seccomp whitelist"
am: 10e7aed13f

Change-Id: I8060b31a8ac20ddd77b7139c5a3bbd8d146dbc27

7 years agoMerge "Expand seccomp whitelist"
Paul Lawrence [Tue, 7 Feb 2017 22:50:43 +0000 (22:50 +0000)]
Merge "Expand seccomp whitelist"

7 years agoMerge "Perform camera permission and app ops check when setting camera for VT."
Brad Ebinger [Tue, 7 Feb 2017 22:33:05 +0000 (22:33 +0000)]
Merge "Perform camera permission and app ops check when setting camera for VT."
am: ed5c217fc0

Change-Id: I0fd4ed2260a9654e2889121022192f62f86a3d0c

7 years agoMerge "Perform camera permission and app ops check when setting camera for VT."
Brad Ebinger [Tue, 7 Feb 2017 22:26:43 +0000 (22:26 +0000)]
Merge "Perform camera permission and app ops check when setting camera for VT."

7 years agohotspot2: expose Passpoint APIs as public
Peter Qiu [Wed, 1 Feb 2017 04:08:38 +0000 (20:08 -0800)]
hotspot2: expose Passpoint APIs as public

Bug: 34862444
Test: frameworks/base/wifi/tests/runtests.sh
Test: frameworks/opt/net/wifi/tests/wifitests/runtests.sh

Change-Id: I8bf5c715b9088c673e59a73a78e18f6e6b64d1d1

7 years agohotspot2: fix class/function/variable names to comply with API guideline
Peter Qiu [Thu, 2 Feb 2017 18:25:05 +0000 (10:25 -0800)]
hotspot2: fix class/function/variable names to comply with API guideline

Bug: 34862444
Test: frameworks/base/wifi/tests/runtests.sh
Test: frameworsk/opt/net/wifi/tests/wifitests/runtests.sh
Change-Id: Ide425c06be46bc41c8f601e732dca0543de096b1

7 years agohotspot2: rename classes to comply with API guideline
Peter Qiu [Thu, 2 Feb 2017 18:22:16 +0000 (10:22 -0800)]
hotspot2: rename classes to comply with API guideline

This is purely a file rename operation.

Bug: 34862444
Test: None
Change-Id: I297a228f3ee7e09c9cce5ca9f677eb1db478fd46

7 years ago[Debug]: Add timeout for dumpNativeBacktraceToFile.
songjinshi [Fri, 16 Dec 2016 09:48:21 +0000 (17:48 +0800)]
[Debug]: Add timeout for dumpNativeBacktraceToFile.

If the debuggerd be blocked, the watchdog and
activitymanager thread will be blocked when the
ANR or watchdog occurs,so we needed to add
timeout for dumpNativeBacktraceToFile.

Change-Id: Iab1a64328e70257025d860638d93a4fb8eaaeea2
Signed-off-by: songjinshi <songjinshi@xiaomi.com>
7 years agoReplace com.android.internal.util.Predicate with java.util.function.Predicate
Paul Duffin [Tue, 7 Feb 2017 15:04:10 +0000 (15:04 +0000)]
Replace com.android.internal.util.Predicate with java.util.function.Predicate

Bug: 35089332
Bug: 30188076
Test: make checkbuild
Merged-In: I0a5b4bf520fc39b59d8d790b01e9cff0d54e6d21
Change-Id: I58e4e35e7b7315033d893748f7c79e1ba6732f39

7 years agoExpand seccomp whitelist
Paul Lawrence [Tue, 7 Feb 2017 16:18:03 +0000 (08:18 -0800)]
Expand seccomp whitelist

Bug: 34979910
Test: System boots, app runs
Change-Id: I8b60a24ac855679251e73edcdec57eb4af4a5610

7 years agoImport CallSite classes and BootstrapMethodError class from ojdk8u60
Orion Hodson [Sun, 5 Feb 2017 15:18:06 +0000 (15:18 +0000)]
Import CallSite classes and BootstrapMethodError class from ojdk8u60

Minor changes to CallSite.java, with other imported unmodified.

Bug: 3319171730550796
Test: make docs
Change-Id: I15e6f05d49d0fcdea8d10d128a957e0d13ca2df2

7 years agoAdd support for wait-on-handlers command.
Tyler Gunn [Tue, 7 Feb 2017 04:47:04 +0000 (20:47 -0800)]
Add support for wait-on-handlers command.

Add support for wait on handlers adb telecom command.  Used in CTS
tests to ensure work is completed once all Telecom handlers have finished
their current work.

Test: CTS, Manual
Bug: 34159263
Change-Id: I14acc0a04710b445c172629c2327813ee73a5a55

7 years agoMerge "Fixes Treble marshaling of strings embedded in structures from Java"
Andreas Huber [Mon, 6 Feb 2017 23:45:53 +0000 (23:45 +0000)]
Merge "Fixes Treble marshaling of strings embedded in structures from Java"
am: 97fca8c035

Change-Id: Iac2492ccc736b83d6ae46022b643fd229c2c307e

7 years agoMerge "Fixes Treble marshaling of strings embedded in structures from Java"
Treehugger Robot [Mon, 6 Feb 2017 23:41:27 +0000 (23:41 +0000)]
Merge "Fixes Treble marshaling of strings embedded in structures from Java"

7 years agoMerge "Add a mechanism to configure the default A2DP codec priorities"
Pavlin Radoslavov [Mon, 6 Feb 2017 23:12:23 +0000 (23:12 +0000)]
Merge "Add a mechanism to configure the default A2DP codec priorities"
am: acf34d8b62

Change-Id: I8a97b344bb09f4bded076ea81875b3b78dc50bea

7 years agoMerge "Hotspot Tile: longclick should open Tethering settings"
Jason Monk [Mon, 6 Feb 2017 23:03:24 +0000 (23:03 +0000)]
Merge "Hotspot Tile: longclick should open Tethering settings"
am: 96c4f1a21e

Change-Id: I42b701c8d390333f6d121bea2ee6c3284e646e9c