Bill Yi
532778f7c1
Import translations. DO NOT MERGE
...
Change-Id: Ie4491aa2ea396835e7fb1db118b1f275a893e0c6
Auto-generated-cl: translation import
2019-08-23 02:02:14 -07:00
Derek Sollenberger
3278661781
Merge "Create C API for accessing android.graphics.Region in native code."
2019-08-22 03:20:53 +00:00
Nazanin Bakhshi
4dee36149f
add checking for carrierConfigs certificates for psim am: 65371b27c8
...
am: 8ae6b4b43b
2019-08-21 20:02:22 -07:00
Nazanin Bakhshi
8ae6b4b43b
add checking for carrierConfigs certificates for psim
...
am: 65371b27c8
2019-08-21 19:33:49 -07:00
Joanne Chung
d38b888249
Merge "Log the error of TCS, TCMS and SysTC."
2019-08-22 02:03:14 +00:00
Jeff Sharkey
eec430b4c6
Merge "Migrate ringtone picking out of MediaProvider."
2019-08-22 01:13:44 +00:00
Xiangyu/Malcolm Chen
6bd1ab881e
Merge "Move filterMobileSubscriptionInSameGroup into KeyguardUpdateMonitor."
2019-08-21 23:15:28 +00:00
TreeHugger Robot
3f0e3d1fc5
Merge "Set path property for filegroup modules"
2019-08-21 23:14:21 +00:00
TreeHugger Robot
4a96de7939
Merge "Fix integer overflow in make_timestamp_ns_locked"
2019-08-21 22:53:40 +00:00
Android Build Merger (Role)
17ac2efeb7
Merge "[automerger skipped] Merge "add certs to carrier configs and store them as UiccAccessRules" into qt-qpr1-dev am: e6e214e227 -s ours am: e7c4466221 -s ours am skip reason: change_id I50fb11444f0da33ae48683b834e6ca50941ad1b7 with SHA1 600a9fee3a is in history"
2019-08-21 22:48:38 +00:00
Nazanin Bakhshi
dd220afc82
[automerger skipped] Merge "add certs to carrier configs and store them as UiccAccessRules" into qt-qpr1-dev am: e6e214e227 -s ours
...
am: e7c4466221600a9fee3a
2019-08-21 15:40:35 -07:00
Lucas Dupin
2315c1e62a
Merge "Only delay bouncer if bypass is off"
2019-08-21 22:39:10 +00:00
Sarah Chin
3792fb408a
[automerger skipped] Merge "Changed regex matching for MCC and MNC" into qt-qpr1-dev am: cb97705a1c
...
am: 76bb761a8ecb76b14fdf
2019-08-21 15:19:08 -07:00
Lucas Dupin
055ef94e99
Only delay bouncer if bypass is off
...
Test: pull up bouncer with bypass on and off
Test: atest KeyguardBouncerTest
Fixes: 137563419
Change-Id: I5ca00ebacda2c893bf62d5c882fe0a244b77f4fc
Merged-In: I5ca00ebacda2c893bf62d5c882fe0a244b77f4fc
(cherry picked from commit d969b76224
2019-08-21 22:13:24 +00:00
Hyunyoung Song
e6224de911
[automerger skipped] Merge "[DO NOT MERGE] qt-qpr1-sysui-dev @ build 5814791" into qt-qpr1-dev am: 05b2c6883e
...
am: 2434ea7e30
2019-08-21 15:12:04 -07:00
Hyunyoung Song
ed0b5a68f2
[automerger skipped] [DO NOT MERGE] qt-qpr1-sysui-dev @ build 5814791 am: 1081450d09
...
am: 5e7940b604
2019-08-21 15:11:52 -07:00
Nazanin Bakhshi
e7c4466221
[automerger skipped] Merge "add certs to carrier configs and store them as UiccAccessRules" into qt-qpr1-dev
...
am: e6e214e227600a9fee3a
2019-08-21 14:59:33 -07:00
Sarah Chin
76bb761a8e
Merge "Changed regex matching for MCC and MNC" into qt-qpr1-dev
...
am: cb97705a1c
2019-08-21 14:49:22 -07:00
Nazanin Bakhshi
65371b27c8
add checking for carrierConfigs certificates for psim
...
Test: utests
Bug: 139133814
Change-Id: I2d5cf7ee4e516ff16a67a5fbef6674a380095888
2019-08-21 21:45:23 +00:00
Nazanin Bakhshi
e6e214e227
Merge "add certs to carrier configs and store them as UiccAccessRules" into qt-qpr1-dev
2019-08-21 21:42:24 +00:00
Hyunyoung Song
2434ea7e30
Merge "[DO NOT MERGE] qt-qpr1-sysui-dev @ build 5814791" into qt-qpr1-dev
...
am: 05b2c6883e
2019-08-21 14:42:22 -07:00
Hyunyoung Song
5e7940b604
[DO NOT MERGE] qt-qpr1-sysui-dev @ build 5814791
...
am: 1081450d09
2019-08-21 14:40:27 -07:00
Jing Ji
e82189ca44
Merge "Proper fix for the LRU IndexOutOfBoundsException"
2019-08-21 21:39:20 +00:00
Sarah Chin
cb97705a1c
Merge "Changed regex matching for MCC and MNC" into qt-qpr1-dev
2019-08-21 21:26:53 +00:00
TreeHugger Robot
05b2c6883e
Merge "[DO NOT MERGE] qt-qpr1-sysui-dev @ build 5814791" into qt-qpr1-dev
2019-08-21 21:19:19 +00:00
TreeHugger Robot
69cf7e8e29
Merge "Inherit source windowing mode in some cases."
2019-08-21 21:10:42 +00:00
Jeff Sharkey
8f18b2a0c1
Migrate ringtone picking out of MediaProvider.
...
Some OEMs have requested the ability to customize the ringtone
picker logic, and that's already supported by the existing
"config_defaultRingtonePickerEnabled" parameter today.
This change is a clean refactoring of the AOSP ringtone picker out
of MediaProvider and into a new "SoundPicker" module, which is
consistent with how some OEMs have already defined their own
"SoundPickerPrebuilt" module.
Bug: 134542205
Test: atest --test-mapping packages/providers/MediaProvider
Change-Id: Iadc60e731e6dcfce651f89bc7598e65541ab0ddf
2019-08-21 14:58:59 -06:00
TreeHugger Robot
dd32e3c0a8
Merge "Avoid using sListeners outside of synchronized block."
2019-08-21 20:49:25 +00:00
Alexey Kuzmin
86b6cd49d7
Merge "Merge "Mark USAGE_NOTIFICATION_EVENT vibrations as notifications" into qt-r1-dev am: 8e70a2826e am: 323b7e6f9c" into qt-qpr1-dev-plus-aosp
...
am: 979d8512e3
2019-08-21 13:40:34 -07:00
Alexey Kuzmin
d62423d3d9
Merge "Mark USAGE_NOTIFICATION_EVENT vibrations as notifications" into qt-r1-dev am: 8e70a2826e am: 0dbbaeddd7
...
am: d6f5d89921
2019-08-21 13:35:20 -07:00
Android Build Merger (Role)
fb07c6a1ca
Merge "Merge "Wait until any background events are processed." into stage-aosp-master am: 0589325300 am: 8cf1cab8c4 am: 120715a56b am: 1117253913"
2019-08-21 20:18:38 +00:00
Raman Tenneti
6460dac0fe
Merge "Wait until any background events are processed." into stage-aosp-master am: 0589325300 am: 8cf1cab8c4 am: 120715a56b
...
am: 1117253913
2019-08-21 13:16:49 -07:00
TreeHugger Robot
2a6df07afa
Merge "Address static cache access issues."
2019-08-21 20:15:41 +00:00
Android Build Merger (Role)
979d8512e3
Merge "Merge "Mark USAGE_NOTIFICATION_EVENT vibrations as notifications" into qt-r1-dev am: 8e70a2826e am: 323b7e6f9c" into qt-qpr1-dev-plus-aosp
2019-08-21 20:15:04 +00:00
Tomasz Wasilczyk
c228ead263
[automerger skipped] Merge "Move processing off of HIDL Binder" into qt-qpr1-dev am: ab45e744e6
...
am: 83f996382df168a291de
2019-08-21 13:14:15 -07:00
Alexey Kuzmin
aee7203c40
Merge "Mark USAGE_NOTIFICATION_EVENT vibrations as notifications" into qt-r1-dev am: 8e70a2826e
...
am: 323b7e6f9c
2019-08-21 13:14:03 -07:00
Alexey Kuzmin
d6f5d89921
Merge "Mark USAGE_NOTIFICATION_EVENT vibrations as notifications" into qt-r1-dev am: 8e70a2826e
...
am: 0dbbaeddd7
2019-08-21 13:14:00 -07:00
Jayant Chowdhary
70809a1847
Merge "Add SYSTEM_CAMERA capability to camera2 and define @SystemApi SYSTEM_CAMERA permissions."
2019-08-21 19:53:16 +00:00
Raman Tenneti
1117253913
Merge "Wait until any background events are processed." into stage-aosp-master am: 0589325300 am: 8cf1cab8c4
...
am: 120715a56b
2019-08-21 12:50:16 -07:00
Alexey Kuzmin
0dbbaeddd7
Merge "Mark USAGE_NOTIFICATION_EVENT vibrations as notifications" into qt-r1-dev
...
am: 8e70a2826e
2019-08-21 12:49:11 -07:00
Tomasz Wasilczyk
83f996382d
Merge "Move processing off of HIDL Binder" into qt-qpr1-dev
...
am: ab45e744e6
2019-08-21 12:47:23 -07:00
Alexey Kuzmin
323b7e6f9c
Merge "Mark USAGE_NOTIFICATION_EVENT vibrations as notifications" into qt-r1-dev
...
am: 8e70a2826e
2019-08-21 12:47:17 -07:00
TreeHugger Robot
69c1135405
Merge "Revert "Metadata: recycle Parcel""
2019-08-21 19:45:27 +00:00
Hall Liu
df5b660418
Merge "Merge "Add carrier config for ignoring user RTT setting" into qt-r1-dev am: 5ca4cef9b5 am: 562a3f81c6" into qt-qpr1-dev-plus-aosp
...
am: 86e816d5e9
2019-08-21 12:42:38 -07:00
Hall Liu
006f4e0ffd
Merge "Add carrier config for ignoring user RTT setting" into qt-r1-dev am: 5ca4cef9b5 am: ecb319ce06
...
am: 5ee40c2be0
2019-08-21 12:31:56 -07:00
Raman Tenneti
120715a56b
Merge "Wait until any background events are processed." into stage-aosp-master am: 0589325300
...
am: 8cf1cab8c4
2019-08-21 12:31:17 -07:00
TreeHugger Robot
ab45e744e6
Merge "Move processing off of HIDL Binder" into qt-qpr1-dev
2019-08-21 19:17:48 +00:00
Android Build Merger (Role)
86e816d5e9
Merge "Merge "Add carrier config for ignoring user RTT setting" into qt-r1-dev am: 5ca4cef9b5 am: 562a3f81c6" into qt-qpr1-dev-plus-aosp
2019-08-21 19:10:47 +00:00
Raman Tenneti
8cf1cab8c4
Merge "Wait until any background events are processed." into stage-aosp-master
...
am: 0589325300
2019-08-21 12:09:54 -07:00
Hall Liu
53068d80da
Merge "Add carrier config for ignoring user RTT setting" into qt-r1-dev am: 5ca4cef9b5
...
am: 562a3f81c6
2019-08-21 12:08:32 -07:00
