OSDN Git Service
Colin Cross [Wed, 13 Dec 2017 00:38:41 +0000 (00:38 +0000)]
Merge "Convert services to Android.bp"
am:
5319777274
Change-Id: I41a44a2684fa322039d3979a663aa4b4e0ef73d7
Jack He [Wed, 13 Dec 2017 00:02:25 +0000 (00:02 +0000)]
Merge "Bluetooth: Add convenience method to convert connection state to string"
am:
f7a69aeeab
Change-Id: I6be2177bcc81cd16824fc20b2dbf7a8a6c9464b8
Colin Cross [Tue, 12 Dec 2017 23:25:09 +0000 (23:25 +0000)]
Merge "Convert services to Android.bp"
Colin Cross [Tue, 5 Dec 2017 17:46:29 +0000 (09:46 -0800)]
Convert services to Android.bp
See build/soong/README.md for more information.
Test: m checkbuild
Change-Id: I417409281c928ea667d937090d2a0d9d72a449a2
Merged-In: I417409281c928ea667d937090d2a0d9d72a449a2
Exempt-From-Owner-Approval: trivial conversion
(cherry-picked from commit
e0b2ee52d2f274a2d46b2e6695e42d2764c39fa7)
Treehugger Robot [Tue, 12 Dec 2017 22:41:13 +0000 (22:41 +0000)]
Merge "Bluetooth: Add convenience method to convert connection state to string"
Hansong Zhang [Tue, 12 Dec 2017 19:11:56 +0000 (19:11 +0000)]
Merge "Make BluetoothPbap implement BluetoothProfile (1/3)"
am:
5b6b73800c
Change-Id: I29c61bf210b8bb01c3a51a12dca4e8a6d3e0d9e1
Treehugger Robot [Tue, 12 Dec 2017 19:02:25 +0000 (19:02 +0000)]
Merge "Make BluetoothPbap implement BluetoothProfile (1/3)"
Jack Yu [Tue, 12 Dec 2017 18:18:09 +0000 (18:18 +0000)]
Merge "Moved data connection response into system api."
am:
8ded1cde4a
Change-Id: Ibcd8c9c11459e39ea8ba32f9bb680716c1ac9b0d
Treehugger Robot [Tue, 12 Dec 2017 18:04:10 +0000 (18:04 +0000)]
Merge "Moved data connection response into system api."
Todd Kennedy [Tue, 12 Dec 2017 15:05:24 +0000 (15:05 +0000)]
Merge "Block the upgrade of persistent apps"
am:
0b30d95dc8
Change-Id: Icd375c367293169b2d2f7661fcb337cafd324714
Todd Kennedy [Tue, 12 Dec 2017 14:55:01 +0000 (14:55 +0000)]
Merge "Block the upgrade of persistent apps"
Paul Duffin [Tue, 12 Dec 2017 13:09:48 +0000 (13:09 +0000)]
Merge "Remove LOCAL_STATIC_SHARED_LIBRARY usage"
am:
60f0b06d19
Change-Id: I530df72ef5dc2c50a2304e5b2fe1ddff2ade2eeb
Treehugger Robot [Tue, 12 Dec 2017 12:55:28 +0000 (12:55 +0000)]
Merge "Remove LOCAL_STATIC_SHARED_LIBRARY usage"
Siyamed Sinir [Tue, 12 Dec 2017 04:15:03 +0000 (04:15 +0000)]
Merge "Fix an incorrect display position of error popup in RTL layout"
am:
b7941c50a0
Change-Id: I67578129771d0c7d52d5da63f24c2f0d6081ab57
Siyamed Sinir [Tue, 12 Dec 2017 03:57:43 +0000 (03:57 +0000)]
Merge "Fix an incorrect display position of error popup in RTL layout"
Hall Liu [Tue, 12 Dec 2017 01:59:47 +0000 (01:59 +0000)]
Merge "Add CarrierConfig key for RTT support"
am:
e5a913661d
Change-Id: I035f9ae243dfe1a8c3bc1300851e88fdcb73dafd
Hall Liu [Tue, 12 Dec 2017 01:44:08 +0000 (01:44 +0000)]
Merge "Add CarrierConfig key for RTT support"
Amit Mahajan [Tue, 12 Dec 2017 01:26:00 +0000 (01:26 +0000)]
Merge "Revert "Add support for send Message with messaging options""
am:
563d93c107
Change-Id: I5db31fdbddfdceb5417f617d7856f8a2a85cedb4
Tyler Gunn [Tue, 12 Dec 2017 01:16:30 +0000 (01:16 +0000)]
Merge "Add carrier config to always play hold tone when remotely held."
am:
c352f5f861
Change-Id: I16a53c2ec034c32c9e771e367c18ab20c1a52cf4
Amit Mahajan [Tue, 12 Dec 2017 01:04:54 +0000 (01:04 +0000)]
Merge "Revert "Add support for send Message with messaging options""
Treehugger Robot [Tue, 12 Dec 2017 00:56:37 +0000 (00:56 +0000)]
Merge "Add carrier config to always play hold tone when remotely held."
Holly Jiuyu Sun [Mon, 11 Dec 2017 23:48:04 +0000 (23:48 +0000)]
Merge "Carrier confirmation code."
am:
6627d2c4df
Change-Id: I444b27d11472cd9a84e4df3b5ae624fba0b13e71
Amit Mahajan [Mon, 11 Dec 2017 23:30:35 +0000 (23:30 +0000)]
Revert "Add support for send Message with messaging options"
This reverts commit
bbef627077c5126b5b1292a5a396d784218c09cf.
Reason for revert: Causing long sms failure
Bug:
68762942
Change-Id: I43c36e3286105459c7e08d1a0b2d89b4c42140b2
Holly Jiuyu Sun [Mon, 11 Dec 2017 23:29:34 +0000 (23:29 +0000)]
Merge "Carrier confirmation code."
Hall Liu [Tue, 21 Nov 2017 00:25:39 +0000 (16:25 -0800)]
Add CarrierConfig key for RTT support
Add the carrier config key.
Test: add fake support for some random carrier, look for the capability
Bug:
63934808
Change-Id: I8a0e33a7ac10fbdcad356059913e7ddcba26bb6c
Hansong Zhang [Sat, 9 Dec 2017 00:05:55 +0000 (16:05 -0800)]
Make BluetoothPbap implement BluetoothProfile (1/3)
* BluetoothPbap will implement BluetoothProfile to be consistent with
other profiles
* Changed the method names to match the BluetoothProfile method
signatures
* Removed doesClassMatchSink() as it is never used
* Disable default DEBUG logs
Test: test with carkits
Bug:
69417672
Change-Id: I0766188f77468808d7505780c781f5fd8608af60
Jack He [Mon, 11 Dec 2017 21:11:20 +0000 (13:11 -0800)]
Bluetooth: Add convenience method to convert connection state to string
* Add method to convert the following state values to string
- BluetoothHeadset.STATE_DISCONNECTED
- BluetoothHeadset.STATE_CONNECTING
- BluetoothHeadset.STATE_CONNECTED
- BluetoothHeadset.STATE_DISCONNECTING
Test: make
Change-Id: Iaa5b6e35d3214ded8edbe29d626e0869651417d1
Paul Duffin [Mon, 11 Dec 2017 20:19:56 +0000 (20:19 +0000)]
Remove LOCAL_STATIC_SHARED_LIBRARY usage
That property is not used during the build so its usage can be safely
removed because it has no effect.
Bug:
30188076
Test: make checkbuild
Change-Id: Ie337426733c26ec12b344b8f4b7467aa7f9f63f3
susanta.patra [Mon, 11 Dec 2017 19:28:44 +0000 (19:28 +0000)]
Merge "Fixed button bar alignment issue in RTL languages"
am:
403c8f72e3
Change-Id: I8a14f71b20fd07ac3fd9025ba4e303a11709fe0a
Treehugger Robot [Mon, 11 Dec 2017 19:10:46 +0000 (19:10 +0000)]
Merge "Fixed button bar alignment issue in RTL languages"
luozhanwei [Mon, 11 Dec 2017 16:05:19 +0000 (16:05 +0000)]
Merge "[DeadLock]AMS PMS MountService"
am:
998ac99db4
Change-Id: I5910f42d91c3c3edcc092a87cc2e291d6e83e75e
Treehugger Robot [Mon, 11 Dec 2017 15:47:45 +0000 (15:47 +0000)]
Merge "[DeadLock]AMS PMS MountService"
Hugo Benichi [Mon, 11 Dec 2017 00:12:16 +0000 (00:12 +0000)]
Merge "DefaultNetworkEvent: fix two bugs with validation times"
am:
c0d951c3e0
Change-Id: I94489cb28fad5d8adddb200b44d72bab2be70b97
Hugo Benichi [Sun, 10 Dec 2017 23:54:13 +0000 (23:54 +0000)]
Merge "DefaultNetworkEvent: fix two bugs with validation times"
Nicolas Geoffray [Sat, 9 Dec 2017 13:38:43 +0000 (13:38 +0000)]
Merge "Revert "Remove empty ScopedArray constructor.""
am:
f6a0a7491b
Change-Id: I9c49b4209e98e90bea62ad1656f7405d771395c9
Nicolas Geoffray [Sat, 9 Dec 2017 13:26:00 +0000 (13:26 +0000)]
Merge "Revert "Remove empty ScopedArray constructor.""
Nicolas Geoffray [Sat, 9 Dec 2017 13:25:26 +0000 (13:25 +0000)]
Revert "Remove empty ScopedArray constructor."
Libcore tests still fail.
This reverts commit
cee368b2b8299db5808284a30e2aa14d0aff8b4a.
Change-Id: I4bcdb7bf08d09d563e54cd8fe005402ae3579164
Hugo Benichi [Wed, 6 Dec 2017 04:28:09 +0000 (13:28 +0900)]
DefaultNetworkEvent: fix two bugs with validation times
This patch fixes two bugs around the validation time calculation for
default network metrics:
- for events representing the absence of a default network, the
validation time was not correctly set to 0.
- for events representing a default network, the validation time was
always set to the duration time. This was overlooked by commit
380a0638588d.
Also fix a minor printing padding issue in DefaultNetworkEvent#toString
Test: manually inspected the output of $ adb shell dumpsys connmetrics
while enabling and disabling wifi.
Change-Id: I0eb4ccdf7a61d3097d0661104cb40d738e59772a
Siyuan Zhou [Sat, 9 Dec 2017 03:06:26 +0000 (03:06 +0000)]
Merge "BootReceiver: Added an event log after the dropbox file copy is successful."
am:
5323d42b82
Change-Id: Iaf53e8a99b61d68c3b920b76c78e9208845c56f3
Treehugger Robot [Sat, 9 Dec 2017 02:55:20 +0000 (02:55 +0000)]
Merge "BootReceiver: Added an event log after the dropbox file copy is successful."
Roshan Pius [Sat, 9 Dec 2017 01:48:34 +0000 (01:48 +0000)]
Merge "Revert "Send empty LinkProperties when entering StoppedState.""
am:
e339662247
Change-Id: I402078a9ad6d92441cf34ca0b9459ee51adac984
Treehugger Robot [Sat, 9 Dec 2017 01:34:07 +0000 (01:34 +0000)]
Merge "Revert "Send empty LinkProperties when entering StoppedState.""
Holly Jiuyu Sun [Sat, 14 Oct 2017 02:06:34 +0000 (19:06 -0700)]
Carrier confirmation code.
If confirmation code is null and required during downloading a profile,
returns a resovable error, and show ConfirmationCodeActivity. After we
get the confirmation code from the user, continue the operation.
Add the confirmationCode as a member in DownloadableSubscription.
Merged-In: Ibe1e0fc5ddb736b411faf48ec9bea3c68972bb99
Test: unit test, e2e on phone
Bug:
36730837
Change-Id: Ibe1e0fc5ddb736b411faf48ec9bea3c68972bb99
Etan Cohen [Sat, 9 Dec 2017 00:14:11 +0000 (00:14 +0000)]
Merge "[AWARE] Make PeerHandle comparable/hashable"
am:
8d621cc042
Change-Id: I31a1ebcecd49b620462f2fb917e6c0c0d8f4d06e
Etan Cohen [Fri, 8 Dec 2017 23:58:36 +0000 (23:58 +0000)]
Merge "[AWARE] Make PeerHandle comparable/hashable"
Siyuan Zhou [Mon, 4 Dec 2017 21:02:11 +0000 (13:02 -0800)]
BootReceiver: Added an event log after the dropbox file copy is successful.
The log can be used to test if LAST KMSG or other items are copied
to dropbox successfully, especially in user builds without root
privilege.
BUG:
69685635
Test: manually verified the desired log from bugreport on user
and userdebug builds.
Change-Id: I6570d95538d678c98d261690ca3c20416d7a31c6
Merged-In: Ie6033bf04c7f79fc596761ab751aa5fcea2c1130
(cherry-picked from commit
bafcd7b59519ce67738c870cf9b69a7c0583cc9b)
Jack He [Fri, 8 Dec 2017 22:30:56 +0000 (22:30 +0000)]
Merge "Bluetooth: Fix boolean logic in quiet mode enable"
am:
1801711c53
Change-Id: I58d0f361db35998b30c70cfd380e35b63e543524
Roshan Pius [Fri, 8 Dec 2017 22:29:50 +0000 (22:29 +0000)]
Revert "Send empty LinkProperties when entering StoppedState."
This reverts commit
b3f9f4a30502477e71fc93037dc58080fddb1853.
Reason for revert: Crash in WifiStateMachine (b/
70394432)
Change-Id: I3a96c822eddcebcdd6621cee878b865171d094e8
Jack He [Fri, 8 Dec 2017 22:13:27 +0000 (22:13 +0000)]
Merge "Bluetooth: Fix boolean logic in quiet mode enable"
Jack Yu [Thu, 30 Nov 2017 22:03:58 +0000 (14:03 -0800)]
Moved data connection response into system api.
This is a preliminary step for IWLAN refactoring, where data response
will be one of the parameter in data service callback.
Test: Telephony sanity tests
bug:
64132030
Merged-In: I7eb5318cd75ca3b7a29d5bf0da18d6b29a228ee1
Change-Id: I7eb5318cd75ca3b7a29d5bf0da18d6b29a228ee1
(cherry picked from commit
e44609b15866d080e0f8813b99d04b51a6f32929)
Seigo Nonaka [Fri, 8 Dec 2017 20:22:03 +0000 (20:22 +0000)]
Merge "Remove empty ScopedArray constructor."
am:
e7120f5056
Change-Id: I451928750550a4b29c6637bb351e5d18f16d04d2
Jack He [Fri, 8 Dec 2017 20:21:37 +0000 (12:21 -0800)]
Bluetooth: Fix boolean logic in quiet mode enable
* Change If97c454a8e5aff34c4f8550f7ade3da413a200b7 introduced a bug that
flipped the logic of quiet mode enable in the handler for
MESSAGE_BLUETOOTH_SERVICE_CONNECTED, causing quiet mode to be enabled
when toggling from Settings and system UI.
Bug:
70395489
Test: make, toggle bluetooth on/off
Change-Id: I405fb462783df0d52d9ce84d2ebe959e56a1aa30
Treehugger Robot [Fri, 8 Dec 2017 20:07:33 +0000 (20:07 +0000)]
Merge "Remove empty ScopedArray constructor."
Adil Aliyev [Fri, 8 Dec 2017 20:07:09 +0000 (20:07 +0000)]
Merge "Add Azerbaijani keyboard layout"
am:
12fc68681b
Change-Id: I89b3c7f86f3571b30003087e68fbbbc46e01dd88
Treehugger Robot [Fri, 8 Dec 2017 19:53:14 +0000 (19:53 +0000)]
Merge "Add Azerbaijani keyboard layout"
Adil Aliyev [Tue, 5 Dec 2017 18:41:14 +0000 (03:41 +0900)]
Add Azerbaijani keyboard layout
KCM for Azerbaijani keyboard is added.
Change-Id: I6190607b4319a98f41d776b476b68e08ce4b07a2
Signed-off-by: Adil Aliyev <adilaliev@gmail.com>
Colin Cross [Fri, 8 Dec 2017 16:26:26 +0000 (16:26 +0000)]
Merge "Remove logtags property"
am:
f2ed7683da
Change-Id: I599af7003bd4ef6cbb8f99ad4caba10ada2f1f43
Colin Cross [Fri, 8 Dec 2017 16:14:07 +0000 (16:14 +0000)]
Merge "Remove logtags property"
susanta.patra [Fri, 8 Dec 2017 06:25:40 +0000 (11:55 +0530)]
Fixed button bar alignment issue in RTL languages
Buttons should be aligned opposite to English in RTL languages.
Test: 1. RTL language
2. Create an alert dialog having positive, negative and neutral button.
3. Check the button bar alignment
Bug:
70363698
Change-Id: I783dfdcf9cb3f85402a4ff3fa4c2d1d1caf5c3da
Signed-off-by: susanta.patra <susanta.patra@lge.com>
Erik Kline [Fri, 8 Dec 2017 05:58:32 +0000 (05:58 +0000)]
Merge "Refactor to IpNeighborMonitor and single-threaded semantics"
am:
b501e7e25b
Change-Id: Iddf69a93400af2262e4522592f9898ee0b79314c
Treehugger Robot [Fri, 8 Dec 2017 05:44:26 +0000 (05:44 +0000)]
Merge "Refactor to IpNeighborMonitor and single-threaded semantics"
Erik Kline [Fri, 8 Dec 2017 03:27:15 +0000 (03:27 +0000)]
Merge "Send empty LinkProperties when entering StoppedState."
am:
efdca004ab
Change-Id: I28628277a2e09e7e01eeb6abb140533cc4b58b0d
Treehugger Robot [Fri, 8 Dec 2017 03:14:09 +0000 (03:14 +0000)]
Merge "Send empty LinkProperties when entering StoppedState."
Erik Kline [Fri, 19 May 2017 00:29:48 +0000 (09:29 +0900)]
Refactor to IpNeighborMonitor and single-threaded semantics
IpReachabilityMonitor (and IpNeighborMonitor) are only accessed from
the IpManager StateMachine's thread. Consequently lots of locking can
now be removed.
Additionally:
- rename BlockingSocketReader to PacketReader
- incorporate IpReachabilityMonitor output in dump()
Test: as follows
- runtest frameworks-net passes
- "adb shell ip neigh change <address> dev wlan0 nud failed"
triggers wifi to disconnect
Bug:
62476366
Bug:
67013397
Change-Id: I18aca29ae0019a72a7e559c2832e0d9b0e33d81e
Colin Cross [Fri, 8 Dec 2017 01:55:05 +0000 (17:55 -0800)]
Remove logtags property
logtags previously needed to be listed in logtags and srcs, now
they only need to be listed in logtags.
Test: m checkbuild
Change-Id: I7750116675d9497782642a9b8c86288d42bf0a54
Colin Cross [Fri, 8 Dec 2017 01:46:48 +0000 (01:46 +0000)]
Merge "Convert services/core/jni to Android.bp"
am:
6a4be8613a
Change-Id: Icbb98c844347418c003a75d80394448cacfb036f
Jack He [Fri, 8 Dec 2017 01:37:35 +0000 (01:37 +0000)]
Merge "BT: Remove dead code in BluetoothHeadset"
am:
ea7363402c
Change-Id: I5ee5d55d3c47fc82698d80610a2bd70cdee794f8
Colin Cross [Fri, 8 Dec 2017 01:20:47 +0000 (01:20 +0000)]
Merge "Convert services/core/jni to Android.bp"
Treehugger Robot [Fri, 8 Dec 2017 01:14:59 +0000 (01:14 +0000)]
Merge "BT: Remove dead code in BluetoothHeadset"
luozhanwei [Tue, 5 Dec 2017 13:31:36 +0000 (21:31 +0800)]
[DeadLock]AMS PMS MountService
Umount externel srotage when phone boot.
It may trigger below dead lock in system_server in the board with external adoptable storage
as below stack:
"Binder_6" prio=5 tid=57 Blocked
| group="main" sCount=1 dsCount=0 obj=0x12fa7fa0 self=0x7f9674d000
| sysTid=3218 nice=0 cgrp=default sched=0/0 handle=0x7f941a3440
| state=S schedstat=(
450091692 353243785 1757 ) utm=30 stm=15 core=8 HZ=100
| stack=0x7f940a7000-0x7f940a9000 stackSize=1013KB
| held mutexes=
at com.android.server.MountService.getVolumeList(MountService.java:3014)
- waiting to lock <0x064315bf> (a java.lang.Object) held by thread 14 B
at android.os.storage.StorageManager.getVolumeList(StorageManager.java:918)
at android.os.storage.StorageManager.getStorageVolume(StorageManager.java:853)
at android.os.Environment.isExternalStorageEmulated(Environment.java:742)
at android.os.Environment.isExternalStorageEmulated(Environment.java:730)
at com.android.server.pm.PackageManagerService.isExternalMediaAvailable(PackageManagerService.java:10378)
at com.android.server.pm.PackageManagerService.nextPackageToClean(PackageManagerService.java:10385)
- locked <0x05b654c7> (a android.util.ArrayMap) A
at android.content.pm.IPackageManager$Stub.onTransact(IPackageManager.java:1636)
at com.android.server.pm.PackageManagerService.onTransact(PackageManagerService.java:2937)
at android.os.Binder.execTransact(Binder.java:458)
"android.fg" prio=5 tid=14 Blocked
| group="main" sCount=1 dsCount=0 obj=0x12da1f90 self=0x7fa9ad8800
| sysTid=1792 nice=0 cgrp=default sched=0/0 handle=0x7f9867f440
| state=S schedstat=(
79482537 29476078 684 ) utm=4 stm=4 core=5 HZ=100
| stack=0x7f9857d000-0x7f9857f000 stackSize=1037KB
| held mutexes=
at com.android.server.am.ActivityManagerService.broadcastIntent(ActivityManagerService.java:19159)
- waiting to lock <0x074b3319> (a com.android.server.am.ActivityManagerService) held by thread 98 C
at android.app.ContextImpl.sendBroadcastAsUser(ContextImpl.java:942)
at com.android.server.MountService.onVolumeStateChangedLocked(MountService.java:1424)
at com.android.server.MountService.onEventLocked(MountService.java:1134)
at com.android.server.MountService.onEvent(MountService.java:1039)
- locked <0x064315bf> (a java.lang.Object) B
at com.android.server.NativeDaemonConnector.handleMessage(NativeDaemonConnector.java:135)
at android.os.Handler.dispatchMessage(Handler.java:107)
at android.os.Looper.loop(Looper.java:207)
at android.os.HandlerThread.run(HandlerThread.java:61)
at com.android.server.ServiceThread.run(ServiceThread.java:46)
"Binder_F" prio=5 tid=98 Blocked
| group="main" sCount=1 dsCount=0 obj=0x13f740a0 self=0x7f96ab6400
| sysTid=3483 nice=0 cgrp=default sched=0/0 handle=0x7f8dbb7440
| state=S schedstat=(
472520780 311910624 1572 ) utm=35 stm=12 core=6 HZ=100
| stack=0x7f8dabb000-0x7f8dabd000 stackSize=1013KB
| held mutexes=
at com.android.server.pm.PackageManagerService.queryContentProviders(PackageManagerService.java:5974)
- waiting to lock <0x05b654c7> (a android.util.ArrayMap) held by thread 57 A
at com.android.server.am.ActivityManagerService.generateApplicationProvidersLocked(ActivityManagerService.java:10786)
at com.android.server.am.ActivityManagerService.attachApplicationLocked(ActivityManagerService.java:7405)
at com.android.server.am.ActivityManagerService.attachApplication(ActivityManagerService.java:7577)
- locked <0x074b3319> (a com.android.server.am.ActivityManagerService) C
at android.app.ActivityManagerNative.onTransact(ActivityManagerNative.java:513)
at com.android.server.am.ActivityManagerService.onTransact(ActivityManagerService.java:2764)
at android.os.Binder.execTransact(Binder.java:458)
Change-Id: Iec16ae1353cba7879838e3116d50f7cdeaee285c
Signed-off-by: luozhanwei <luozhanwei@xiaomi.com>
Jordan Liu [Fri, 8 Dec 2017 00:29:53 +0000 (00:29 +0000)]
Merge "IMS: Add support for STK CC feature"
am:
bc813005b8
Change-Id: I69dcdb09f8e174acfe6268ede87b1f804b0e33f1
Jordan Liu [Fri, 8 Dec 2017 00:14:57 +0000 (00:14 +0000)]
Merge "IMS: Add support for STK CC feature"
Jordan Liu [Thu, 7 Dec 2017 23:30:02 +0000 (23:30 +0000)]
Merge "Fix available/remaining PIN/PUK attempts."
am:
e3ab43eefe
Change-Id: Ia10a529b8d9817fe00d8688c78e3499327c9a8c6
Jordan Liu [Thu, 7 Dec 2017 23:17:11 +0000 (23:17 +0000)]
Merge "Fix available/remaining PIN/PUK attempts."
Colin Cross [Wed, 6 Dec 2017 01:33:58 +0000 (17:33 -0800)]
Convert services/core/jni to Android.bp
See build/soong/README.md for more information.
Test: m checkbuild
Change-Id: I11a9a39d14adc4c202c6a1725e92e52a38ff2585
Merged-In: I11a9a39d14adc4c202c6a1725e92e52a38ff2585
(cherry picked from commit
1742dd8cf301904f8fd6e173a08ec8c1888b606e)
Hansong Zhang [Thu, 7 Dec 2017 21:55:10 +0000 (21:55 +0000)]
Merge "Bluetooth HID Device: format code, fix docstring, hide unplug()"
am:
0d3990b235
Change-Id: Icbbaec689208fc9b890a10c16f7b7fa910a5a66c
Etan Cohen [Mon, 4 Dec 2017 15:53:31 +0000 (07:53 -0800)]
[AWARE] Make PeerHandle comparable/hashable
Add public equals()/hash() methods to PeerHandle. Allows the handle to
be used across multiple calls/sessions.
(cherry-pick of commit
4454bda052aea4087880674bb0e0f81ce2647009)
Bug:
68931709
Test: builds, unit test, integration test
Change-Id: Id06659a640931585893f21b9ee04982d921fe511
Merged-In: I87df50edb948a7afc90e496165013235ddca1e48
Treehugger Robot [Thu, 7 Dec 2017 21:37:45 +0000 (21:37 +0000)]
Merge "Bluetooth HID Device: format code, fix docstring, hide unplug()"
Jack He [Thu, 7 Dec 2017 20:06:21 +0000 (12:06 -0800)]
BT: Remove dead code in BluetoothHeadset
The following hidden API methods are not implemented by the stack and
should be removed:
- getBatteryUsageHint()
- acceptIncomingConnect()
- rejectIncomingConnect()
The following hidden API methods are no longer needed due to lack of
usage and should be removed:
- enableWBS()
- disableWBS()
- bindResponse()
Bug:
70336991
Test: make
Change-Id: I75bd6735573e4cbc61b5bef8722b8badac2e9170
Svetoslav Ganov [Thu, 7 Dec 2017 19:01:46 +0000 (19:01 +0000)]
Merge "Use correct user id for permission check for instant foreground service"
am:
b76e984536
Change-Id: I2b8dc9fa3fa1e48060c0f1204dddf89a8df4c26d
Jeff Sharkey [Thu, 7 Dec 2017 18:05:36 +0000 (18:05 +0000)]
Merge changes from topic "predicates_aosp"
am:
76c275e7d3
Change-Id: If9ae0263328b73757de4578b344af0b10a3b2f8f
Jeff Sharkey [Thu, 7 Dec 2017 17:58:52 +0000 (17:58 +0000)]
Emit all APIs using Predicates.
am:
bc4f48b21d
Change-Id: Ibc934ce755f217a52b890c1942b9abc9040e65d3
Jeff Sharkey [Thu, 7 Dec 2017 17:52:08 +0000 (17:52 +0000)]
Massage APIs for upcoming doclava change.
am:
983df8cc6c
Change-Id: I79ddea77f87d44f3574a8f33c49825b373ed4e3f
Svetoslav Ganov [Thu, 7 Dec 2017 17:43:52 +0000 (17:43 +0000)]
Merge "Use correct user id for permission check for instant foreground service"
Jeff Sharkey [Thu, 7 Dec 2017 16:39:39 +0000 (16:39 +0000)]
Merge changes from topic "predicates_aosp"
* changes:
Deeper sanity checking of emitted types.
Emit all APIs using Predicates.
Massage APIs for upcoming doclava change.
liulvping [Thu, 7 Dec 2017 16:21:29 +0000 (16:21 +0000)]
Merge "fix system app's abi error after uninstall updated version."
am:
a863c7f6b7
Change-Id: Ia16d082665b6327586be628e136a52d6510d47a1
Treehugger Robot [Thu, 7 Dec 2017 14:53:04 +0000 (14:53 +0000)]
Merge "fix system app's abi error after uninstall updated version."
Neil Fuller [Thu, 7 Dec 2017 13:54:16 +0000 (13:54 +0000)]
Merge "Fix doc typo. Improve class javadoc..."
am:
e08f918a6e
Change-Id: I2e933a55ce3b239ad9a2afee964d288dcbd04a11
Neil Fuller [Thu, 7 Dec 2017 11:02:52 +0000 (11:02 +0000)]
Merge "Fix doc typo. Improve class javadoc..."
Bowgo Tsai [Thu, 7 Dec 2017 10:08:27 +0000 (10:08 +0000)]
Merge "Disable AVB check in runtime vintf"
am:
86c9951383
Change-Id: I70295f5685d18bed99822f4e712edfb6c2a1b280
Ruthwar Kumar Ambeer [Thu, 9 Mar 2017 13:16:17 +0000 (18:46 +0530)]
Fix available/remaining PIN/PUK attempts.
* Fix to properly display attempts remaining for PIN/PUK.
* On bootup show the available PIN/PUK attempts if sim
is locked on PIN/PUK.
* Show incorrect password message on entering wrong PIN/PUK
password.
In KeyGuardSimPinView and KeyGuardSimPukView, check for sim locked on
PIN and reset the flags to show the default message.
Bug:
37782683
Change-Id: I46d7d5dd86977cddecf3147add73ef6ccc64b257
Erik Kline [Wed, 6 Dec 2017 04:37:09 +0000 (13:37 +0900)]
Send empty LinkProperties when entering StoppedState.
Test: as follows
- built
- flashed
- booted
- runtest frameworks-net passes
- changing from DHCPv4 to static while continuously pinging the
default gateway works jsut fine
- dumpsys log shows that during the change we send the empty LP:
12-06 08:46:51.085 - CMD_ON_QUIT wlan0/23 0 0 null [rcvd_in=StoppingState, proc_in=StoppingState]
12-06 08:46:51.092 - INVOKE onLinkPropertiesChange({{InterfaceName: wlan0 LinkAddresses: [] Routes: [] DnsAddresses: [] Domains: null MTU: 0}})
Bug:
69800563
Change-Id: I01047e9a72fce718a167c592bf14406c3bab3ba9
Treehugger Robot [Thu, 7 Dec 2017 08:15:35 +0000 (08:15 +0000)]
Merge "Disable AVB check in runtime vintf"
Svet Ganov [Thu, 7 Dec 2017 07:45:38 +0000 (23:45 -0800)]
Use correct user id for permission check for instant foreground service
Test: cts-tradefed run cts-dev -m CtsAppSecurityHostTestCases
-t android.appsecurity.cts.EphemeralTest#testStartForegrondService
bug:
68275646
Change-Id: I196522c49ae8a7e0ec07bf631f04bae51e96db5b
liulvping [Mon, 6 Nov 2017 09:36:40 +0000 (17:36 +0800)]
fix system app's abi error after uninstall updated version.
When uninstall an updated system app, we always did as
following steps. First we delete data structure by calling
deleteInstalledPackageLIF(), then enable it from disabled
system packages and re-adding to PackageSettings map by
calling addPackageLPw(). At last re-installing apps in
system partition with scanPackageTracedLI().
But if an package with sharedUserId readded failed with
exception of 'Adding duplicate shared id: xxx', then we
cann't reuse it's derived CPU Abis from settings, others
we could get CPU Abis uninitialized errors.
Test: Manual; Update an system app with sharedUserId
Test: Manual; Uninstall and ensure it run ok
Change-Id: Icfda17c5004d291c664ed80d578aca4b7cf4a975
Signed-off-by: liulvping <liulvping@xiaomi.com>
Jeff Sharkey [Thu, 7 Dec 2017 04:12:23 +0000 (21:12 -0700)]
Deeper sanity checking of emitted types.
When emitting a method or field, verify that we're able to reference
all mentioned types. This ensures that we don't accidentally
reference undefined classes/interfaces.
Test: manual inspection of API files
Bug:
69791141
Change-Id: I84e0c87fe83daa118661f61dbdf17b58ea5282d4
Merged-In: I84e0c87fe83daa118661f61dbdf17b58ea5282d4
Bo Hu [Thu, 7 Dec 2017 06:31:36 +0000 (06:31 +0000)]
Merge "Revert "Add odm sepolicy support to SELinuxMMAC.java""
am:
0e8440632a
Change-Id: I041cd82448479a2d1f67d1cc5ef854272348591f
Xin Li [Thu, 7 Dec 2017 06:23:41 +0000 (06:23 +0000)]
Merge "DO NOT MERGE: Merge Oreo MR1 into master"
am:
d18ed49f9d -s ours
Change-Id: I8a40fa162f8acfcc5f681a1419a903d27b18906c
Jeff Sharkey [Thu, 7 Dec 2017 04:02:11 +0000 (21:02 -0700)]
Emit all APIs using Predicates.
Generate APIs using updated doclava.
Test: manual inspection of API text files
Bug:
69505783
Change-Id: I2efd22998a64ebb57588b073c4a591242f4aef91
Merged-In: I2efd22998a64ebb57588b073c4a591242f4aef91
Jeff Sharkey [Thu, 7 Dec 2017 03:53:38 +0000 (20:53 -0700)]
Massage APIs for upcoming doclava change.
These changes are needed to ensure that "checkapi" doesn't claim
that we're changing the API after an upcoming doclava change.
Test: manual inspection of API text files
Bug:
69505783
Change-Id: I8292ba80cc65b7dd78f0e9dba4fcc7ffcedfab9c
Merged-In: I8292ba80cc65b7dd78f0e9dba4fcc7ffcedfab9c