diff options
| author | Scott Lobdell <slobdell@google.com> | 2019-01-31 11:53:41 -0800 |
|---|---|---|
| committer | Scott Lobdell <slobdell@google.com> | 2019-02-01 14:08:42 -0800 |
| commit | 88b45c586d461df38b866d529bc98d1dfa3e8838 (patch) | |
| tree | ae57a86275dac94c0899015923778f3016c865b2 /obex | |
| parent | 067596650927fa91a97355e84b152b21826f7ae2 (diff) | |
| parent | 9b9ca46fc2d3da231bf9ef6ff630105720f94cf2 (diff) | |
Merge QP1A.190122.001
Conflicts:
api/system-current.txt
core/java/android/bluetooth/BluetoothAdapter.java
core/jni/android_util_Process.cpp
core/jni/com_android_internal_os_Zygote.cpp
core/res/res/values/config.xml
core/res/res/values/symbols.xml
media/java/android/media/MediaCodecInfo.java
packages/SystemUI/src/com/android/systemui/statusbar/SignalClusterView.java
services/core/java/com/android/server/ConnectivityService.java
services/core/java/com/android/server/LocationManagerService.java
services/core/java/com/android/server/am/ActivityManagerService.java
services/core/java/com/android/server/connectivity/NetworkAgentInfo.java
services/core/java/com/android/server/location/GnssLocationProvider.java
services/core/java/com/android/server/wm/ActivityStack.java
services/net/java/android/net/ip/IpClient.java
telecomm/java/android/telecom/Connection.java
telephony/java/android/telephony/ims/ImsCallSession.java
telephony/java/android/telephony/ims/ImsCallSessionListener.java
telephony/java/android/telephony/ims/aidl/IImsCallSessionListener.aidl
telephony/java/android/telephony/ims/compat/stub/ImsCallSessionImplBase.java
telephony/java/com/android/ims/internal/IImsCallSessionListener.aidl
wifi/java/android/net/wifi/WifiConfiguration.java
Change-Id: I367301986f2ae80a528050c3d78776b5a4c6b5ee
Diffstat (limited to 'obex')
| -rw-r--r-- | obex/api/current.txt | 1 | ||||
| -rw-r--r-- | obex/api/removed.txt | 1 | ||||
| -rw-r--r-- | obex/api/system-current.txt | 1 | ||||
| -rw-r--r-- | obex/api/system-removed.txt | 1 | ||||
| -rw-r--r-- | obex/api/test-current.txt | 1 | ||||
| -rw-r--r-- | obex/api/test-removed.txt | 1 |
6 files changed, 6 insertions, 0 deletions
diff --git a/obex/api/current.txt b/obex/api/current.txt index 1cd562feff8d..f142bc86d7d6 100644 --- a/obex/api/current.txt +++ b/obex/api/current.txt @@ -1,3 +1,4 @@ +// Signature format: 2.0 package javax.obex { public class ObexPacket { diff --git a/obex/api/removed.txt b/obex/api/removed.txt index e69de29bb2d1..d802177e249b 100644 --- a/obex/api/removed.txt +++ b/obex/api/removed.txt @@ -0,0 +1 @@ +// Signature format: 2.0 diff --git a/obex/api/system-current.txt b/obex/api/system-current.txt index e69de29bb2d1..d802177e249b 100644 --- a/obex/api/system-current.txt +++ b/obex/api/system-current.txt @@ -0,0 +1 @@ +// Signature format: 2.0 diff --git a/obex/api/system-removed.txt b/obex/api/system-removed.txt index e69de29bb2d1..d802177e249b 100644 --- a/obex/api/system-removed.txt +++ b/obex/api/system-removed.txt @@ -0,0 +1 @@ +// Signature format: 2.0 diff --git a/obex/api/test-current.txt b/obex/api/test-current.txt index e69de29bb2d1..d802177e249b 100644 --- a/obex/api/test-current.txt +++ b/obex/api/test-current.txt @@ -0,0 +1 @@ +// Signature format: 2.0 diff --git a/obex/api/test-removed.txt b/obex/api/test-removed.txt index e69de29bb2d1..d802177e249b 100644 --- a/obex/api/test-removed.txt +++ b/obex/api/test-removed.txt @@ -0,0 +1 @@ +// Signature format: 2.0 |