Paul Duffin
84e6f25e26
Merge "Move rewriting of references in OpenJDK source files to libcore" am: 9e9a777021
...
am: 43ab63fe75
2019-11-13 06:05:05 -08:00
Paul Duffin
43ab63fe75
Merge "Move rewriting of references in OpenJDK source files to libcore"
...
am: 9e9a777021
2019-11-13 04:11:45 -08:00
Treehugger Robot
9e9a777021
Merge "Move rewriting of references in OpenJDK source files to libcore"
2019-11-13 10:57:35 +00:00
Jeff Vander Stoep
37e3d62cbc
Merge "Speed up and reenable test for b/141603906" am: 58578023dc
...
am: 24589540b2
2019-11-13 02:29:55 -08:00
Jeff Vander Stoep
24589540b2
Merge "Speed up and reenable test for b/141603906"
...
am: 58578023dc
2019-11-13 02:21:51 -08:00
Treehugger Robot
58578023dc
Merge "Speed up and reenable test for b/141603906"
2019-11-13 10:05:49 +00:00
Jiyong Park
2072e8f7c6
Merge "Rename # vndk tag to # llndk" am: ba07364e94
...
am: 7172b09ef2
2019-11-12 22:54:47 -08:00
Jiyong Park
7172b09ef2
Merge "Rename # vndk tag to # llndk"
...
am: ba07364e94
2019-11-12 22:46:26 -08:00
Treehugger Robot
ba07364e94
Merge "Rename # vndk tag to # llndk"
2019-11-13 06:36:36 +00:00
Jiyong Park
d0c8d9bd22
Rename # vndk tag to # llndk
...
The APIs that are tagged with # vndk are actually for LLNDK libraries.
Although LLNDK is part of VNDK, calling those APIs 'vndk' has given
users a wrong perception that the APIs don't need to be kept stable
because that's the norm for most of the VNDK libraries that are not
LLNDK.
In order to eliminate the misunderstanding, rename the tag to 'llndk' so
that people introducing new such API will realize what they are signing
themselves up for.
Exempt-From-Owner-Approval: cherry-pick from internal gerrit
Bug: 143765505
Test: m
Merged-In: I7ae77e232ec25cbe7afd98d1b68fc7a7fcf9bdfd
(cherry picked from commit a9258ab2e1
2019-11-13 05:51:59 +00:00
Cheney Ni
f03727fa2f
[automerger skipped] Merge "Add helpers to check whether the BluetoothCodecConfig instance is selectable" into qt-qpr1-dev
...
am: 2dbc1c0d82f1936c3423
2019-11-12 18:53:32 -08:00
TreeHugger Robot
2dbc1c0d82
Merge "Add helpers to check whether the BluetoothCodecConfig instance is selectable" into qt-qpr1-dev
2019-11-13 02:48:43 +00:00
Joshua Baxter
f23b8cedd7
Merge "docs: fix code example" into qt-dev am: 330701c156 am: e53e500eac
...
am: ce02f1c4ac
2019-11-12 18:21:10 -08:00
Joshua Baxter
ce02f1c4ac
Merge "docs: fix code example" into qt-dev am: 330701c156
...
am: e53e500eac
2019-11-12 18:13:03 -08:00
Joshua Baxter
e53e500eac
Merge "docs: fix code example" into qt-dev
...
am: 330701c156
2019-11-12 18:04:50 -08:00
TreeHugger Robot
330701c156
Merge "docs: fix code example" into qt-dev
2019-11-13 01:26:15 +00:00
Brian Duff
65e3a342c4
Merge "Speed up WriteKeepSet when generate_conditional_proguard_rules is off." am: a9ee3aaa5f
...
am: 1f44c03058
2019-11-12 16:16:31 -08:00
Brian Duff
1f44c03058
Merge "Speed up WriteKeepSet when generate_conditional_proguard_rules is off."
...
am: a9ee3aaa5f
2019-11-12 16:08:27 -08:00
Xiangyu/Malcolm Chen
cab7ff3400
[automerger skipped] Merge changes from topic "carrier_certs_cherrypick" am: 786d84b690 -s ours
...
am: 5a8b58fe6d293ecad827
2019-11-12 16:04:30 -08:00
Treehugger Robot
a9ee3aaa5f
Merge "Speed up WriteKeepSet when generate_conditional_proguard_rules is off."
2019-11-12 23:55:41 +00:00
Xiangyu/Malcolm Chen
5a8b58fe6d
[automerger skipped] Merge changes from topic "carrier_certs_cherrypick"
...
am: 786d84b690293ecad827
2019-11-12 15:52:37 -08:00
Joshua Baxter
87256ee062
Merge "docs: fix typos" into qt-dev am: 748dd651f4 am: fcf4eace37
...
am: 2612ee2d6d
2019-11-12 15:38:02 -08:00
Joshua Baxter
2612ee2d6d
Merge "docs: fix typos" into qt-dev am: 748dd651f4
...
am: fcf4eace37
2019-11-12 15:33:33 -08:00
Xiangyu/Malcolm Chen
786d84b690
Merge changes from topic "carrier_certs_cherrypick"
...
* changes:
Fix crashes seen when checking for carrierConfig certificates
add checking for carrierConfigs certificates for psim
2019-11-12 23:31:47 +00:00
Joshua Baxter
fcf4eace37
Merge "docs: fix typos" into qt-dev
...
am: 748dd651f4
2019-11-12 15:29:04 -08:00
Android Build Merger (Role)
feb80c2665
Merge "Merge "Expose TelephonyManager#getDeviceSoftwareVersion(int) as system API." am: 096cd20182 am: dd1f02d02e" into qt-qpr1-dev-plus-aosp
2019-11-12 23:13:08 +00:00
Hall Liu
b196b9b7e3
Merge "Expose TelephonyManager#getDeviceSoftwareVersion(int) as system API." am: 096cd20182
...
am: dd1f02d02e
2019-11-12 15:12:21 -08:00
Nate(Qiang) Jiang
d76f407953
Merge "[WifiAware] fix creator from parcel" into qt-qpr1-dev
...
am: e3ff000ca5
2019-11-12 15:11:59 -08:00
TreeHugger Robot
748dd651f4
Merge "docs: fix typos" into qt-dev
2019-11-12 23:10:51 +00:00
Hall Liu
dd1f02d02e
Merge "Expose TelephonyManager#getDeviceSoftwareVersion(int) as system API."
...
am: 096cd20182
2019-11-12 15:04:24 -08:00
Kevin Hufnagle
d277bd6b30
Merge "docs: Fix broken link to NPN protocol" am: cab84c8dd3
...
am: 7c28465f70
2019-11-12 14:58:12 -08:00
Hall Liu
096cd20182
Merge "Expose TelephonyManager#getDeviceSoftwareVersion(int) as system API."
2019-11-12 22:55:16 +00:00
TreeHugger Robot
e3ff000ca5
Merge "[WifiAware] fix creator from parcel" into qt-qpr1-dev
2019-11-12 22:55:10 +00:00
Kevin Hufnagle
7c28465f70
Merge "docs: Fix broken link to NPN protocol"
...
am: cab84c8dd3
2019-11-12 14:49:21 -08:00
Kevin Hufnagle
cab84c8dd3
Merge "docs: Fix broken link to NPN protocol"
2019-11-12 22:32:22 +00:00
Nazanin Bakhshi
e55c2f992c
Fix crashes seen when checking for carrierConfig certificates
...
1. Do not throw exception when packageName is not found
2. Fix NPE caused by null SubscriptionInfo
Bug: 140122832
Test: Utest and manual test
Change-Id: I686647419896a1780f0697b3ed5d319363675f5f
Merged-In: I686647419896a1780f0697b3ed5d319363675f5f
2019-11-12 14:25:09 -08:00
Nazanin Bakhshi
8fe1f7cb5c
add checking for carrierConfigs certificates for psim
...
Test: utests
Bug: 139133814
Change-Id: I2d5cf7ee4e516ff16a67a5fbef6674a380095888
Merged-In: I2d5cf7ee4e516ff16a67a5fbef6674a380095888
2019-11-12 14:24:16 -08:00
Meng Wang
4ff5ec3f98
Expose TelephonyManager#getDeviceSoftwareVersion(int) as system API.
...
Bug: 142228257
Test: make
Change-Id: I1cddd570d5c1203ca749be0ac78093df9e97ee3b
Merged-In: I1cddd570d5c1203ca749be0ac78093df9e97ee3b
2019-11-12 13:47:27 -08:00
Tyler Gunn
b0078ccd04
Merge "Cleanup video provider binder code." am: 398794c0a6
...
am: bd9bf9f9c7
2019-11-12 13:13:04 -08:00
Grace Jia
12726efeeb
Merge "Add response to notify that an outgoing call is screened." am: 46758be25c
...
am: 4f8cd35a90
2019-11-12 13:04:31 -08:00
Tyler Gunn
bd9bf9f9c7
Merge "Cleanup video provider binder code."
...
am: 398794c0a6
2019-11-12 13:04:21 -08:00
Grace Jia
4f8cd35a90
Merge "Add response to notify that an outgoing call is screened."
...
am: 46758be25c
2019-11-12 12:56:44 -08:00
Tyler Gunn
398794c0a6
Merge "Cleanup video provider binder code."
2019-11-12 20:47:38 +00:00
Treehugger Robot
46758be25c
Merge "Add response to notify that an outgoing call is screened."
2019-11-12 20:44:43 +00:00
Nate(Qiang) Jiang
6d0eef4d2c
[WifiAware] fix creator from parcel
...
creator should read all content from parcel before verify available
Bug: 144286370
Test: atest android.net.wifi
Change-Id: Ie0f4954f5ca6cdb0ae1f77bfd4420b75f302c0f3
Merged-In: Ie0f4954f5ca6cdb0ae1f77bfd4420b75f302c0f3
2019-11-12 11:36:33 -08:00
satayev
c265820ec3
Merge "Add --no-test-api-acces to am instrument." am: 188abff5b2
...
am: 5c8ed7f6e7
2019-11-12 10:53:34 -08:00
satayev
5c8ed7f6e7
Merge "Add --no-test-api-acces to am instrument."
...
am: 188abff5b2
2019-11-12 10:49:01 -08:00
Hector Dearman
bf83edfc5f
[automerger skipped] Merge "Add Perfetto upload logging atoms" am: 07c402335a -s ours
...
am: d9b11a283d32a89c15a7
2019-11-12 10:48:55 -08:00
Tyler Gunn
d1fdf3a85b
Cleanup video provider binder code.
...
1. Ensure we always unlink for death from the VideoCallImpl.
2. Ensure we compare the binders in the Call instance properly so that
we are not always replacing the VideoCallImpl used.
3. Ensure we cleanup the VideoCallImpl when its being removed.
Test: Manual testing of video calls for regressions.
Bug: 121156974
Change-Id: I440e8fb4ab9a5051ee02358933c495de736e2bd0
2019-11-12 10:43:09 -08:00
Hector Dearman
d9b11a283d
[automerger skipped] Merge "Add Perfetto upload logging atoms"
...
am: 07c402335a32a89c15a7
2019-11-12 10:41:42 -08:00
