lucaslin
cda16ed7ae
Remove unused import IConnectivityManager
...
Bug: 182963397
Test: m
Change-Id: I106b3e4f68b4e5610a238931aa3e81afdd927422
2021-03-19 08:07:37 +00:00
Remi NGUYEN VAN
6dae2c8f59
Merge "Remove Preconditions usage in TestNetworkSpecifier" into sc-dev
2021-03-19 04:49:52 +00:00
Remi NGUYEN VAN
636397a6d6
Merge "Revert "Revert "Remove connectivity dependency on Preconditions""" into sc-dev
2021-03-19 04:49:06 +00:00
Remi NGUYEN VAN
698a529458
[automerger skipped] Merge "Add TEST_NETWORK_SERVICE to module API" am: 7e26e33269 am: 6d208315f8 am: 3e876a2147 -s ours
...
am skip reason: skip tag Change-Id I0690251ddfcdaa8a34830e110b75869a370de389 with SHA-1 d31b35212c is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1629260
Change-Id: Icef19df8c50013e369dcecba883928787ea20733
2021-03-19 04:28:10 +00:00
TreeHugger Robot
c665c08f04
Merge changes from topic "sc_reverts_for_b_183104573" into sc-dev
...
* changes:
Revert "Correct recycling to take setViewId into account."
Revert "Ensure the view being recycled has been inflated before."
2021-03-19 03:50:31 +00:00
Haining Chen
82a38b099e
Merge "Add biometric component info and face type into SensorPropertiesInternal" into sc-dev
2021-03-19 03:49:10 +00:00
Remi NGUYEN VAN
3e876a2147
Merge "Add TEST_NETWORK_SERVICE to module API" am: 7e26e33269 am: 6d208315f8
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1629260
Change-Id: I3cd53e2c9f9ed61153b083661ff0402cf1eb607b
2021-03-19 03:44:03 +00:00
Chris Li
667d242404
Merge "Fix non-resizable split flicker tests" into sc-dev
2021-03-19 03:19:26 +00:00
Remi NGUYEN VAN
6d208315f8
Merge "Add TEST_NETWORK_SERVICE to module API" am: 7e26e33269
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1629260
Change-Id: I78e28855dce5b38785ec60bf1c5489ebf2b98ded
2021-03-19 03:07:53 +00:00
Peter Collingbourne
f1c8817e0f
Merge "Add missing null check for mBatteryPercentView." into sc-dev
2021-03-19 02:55:42 +00:00
Paul Hu
184a284502
Merge "Fix CS external dependencies on CarrierDefaultApp" am: 25be9509b8 am: e51271ca2f am: 7f507fe7fe
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1644389
Change-Id: Ic31b153806395cbec7b36227b973a080b66382c3
2021-03-19 02:53:41 +00:00
Chalard Jean
93b894cd80
Merge "Check for FEATURE_TELEPHONY instead of CM" am: 6df94880b3 am: 318bbccc3e am: a7a1251b04
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1639905
Change-Id: I7722a85af54b21acf1882810df203b3bb833d530
2021-03-19 02:53:19 +00:00
Remi NGUYEN VAN
a860abf1da
Merge "Add InetAddressCompat" am: b648508ccb am: 23511a3eba am: 0afced9423
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1645289
Change-Id: I90dba64e96080cbd29f538de6dcb514dea4b6cbd
2021-03-19 02:52:58 +00:00
Remi NGUYEN VAN
2f355196c5
Merge "Move network selection utils to Connectivity" am: c9f553c7ed am: 295bcd9be7 am: 73d3166547
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1645291
Change-Id: I0b984a01e1688b8484f3500945d0e429e1b3ca00
2021-03-19 02:52:41 +00:00
Treehugger Robot
bd38846660
[automerger skipped] Merge "Keystore 2.0: Fix diagnosing invalid key in CipherSpiBase." am: be1b1d5550 am: 1ade004e0f am: 6f06dae1c3 -s ours
...
am skip reason: skip tag Change-Id Idc9c7dc2614a47818227a06fe76078f72c0c1f57 with SHA-1 a1963a9b64 is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1646146
Change-Id: I8333348d82801b0a2b040f3f38cfa4ae6287c873
2021-03-19 02:52:10 +00:00
Treehugger Robot
579d132d4d
[automerger skipped] Merge "Keystore 2.0: No longer install the legacy provider." am: e72a7b4f1b am: 02ee21ec65 am: d27fb1090a -s ours
...
am skip reason: skip tag Change-Id I0d71d3c9cdd586a508827eb26120c872cb8643ea with SHA-1 d2d4c69a66 is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1645706
Change-Id: I7a1c3d61d224a86e074b14f33caeb9740b976da2
2021-03-19 02:51:36 +00:00
Kai Shi
e7c4fb3919
[automerger skipped] Merge "Add the LCE system API" am: 26ba4d0d09 am: 855075a2c2 am: 1224d2650b -s ours
...
am skip reason: skip tag Change-Id I5899acf02006a164e31f9b82aeaa7974dd6d2869 with SHA-1 5d530fab23 is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1643471
Change-Id: Ib94b84432adf0bba69b298c267b19e14fae0dc80
2021-03-19 02:51:11 +00:00
Amit Mahajan
058270b9a6
[automerger skipped] Merge "Clarifying documentation for SliceInfo per API council feedback." am: afb77c6f83 am: ddc8641c01 am: f36b5ff898 -s ours
...
am skip reason: skipped by user reminv
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1642743
Change-Id: I2c914d5d25c3cb544a1d4a810af9c44bb1b8f60f
2021-03-19 02:50:46 +00:00
Lee Shombert
561400372c
Merge "Move PM cache invalidate inside mlock" into sc-dev
2021-03-19 02:46:36 +00:00
Amit Mahajan
69ef020c8e
Merge "Clarifying documentation for SliceInfo per API council feedback." into sc-dev
2021-03-19 02:32:35 +00:00
Remi NGUYEN VAN
7e26e33269
Merge "Add TEST_NETWORK_SERVICE to module API"
2021-03-19 02:32:00 +00:00
Paul Hu
7f507fe7fe
Merge "Fix CS external dependencies on CarrierDefaultApp" am: 25be9509b8 am: e51271ca2f
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1644389
Change-Id: Ieef1ccfc59761bbd570c457ef126d7f3489d424f
2021-03-19 02:26:45 +00:00
Chalard Jean
a7a1251b04
Merge "Check for FEATURE_TELEPHONY instead of CM" am: 6df94880b3 am: 318bbccc3e
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1639905
Change-Id: Idcb987bc2efef9fbbf947d5c7dc0630d7ad45ddc
2021-03-19 02:26:22 +00:00
Chilun Huang
df8f101244
Merge "Do not use obsoleted snapshot as staring window" into sc-dev
2021-03-19 02:07:48 +00:00
Wilson Wu
69a14b8a8e
Merge "Introduce InputMethodSessionWrapper for InputMethodManager" into sc-dev
2021-03-19 02:05:02 +00:00
Paul Hu
e51271ca2f
Merge "Fix CS external dependencies on CarrierDefaultApp" am: 25be9509b8
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1644389
Change-Id: Ia2d8822d0230fd93893399bc5a61c9af7a355139
2021-03-19 01:50:44 +00:00
Wilson Wu
17827d754a
Introduce InputMethodSessionWrapper for InputMethodManager
...
To simplify InputMethodManager code logic, have a wrapper
class which encapsulates IPCs from InputMethodManager to
InputMethodService.
Bug: 167948374
Test: atest CtsInputMethodTestCases
Change-Id: Ifb4f86098011fe74cf4159446106d6c15c30fa30
2021-03-19 09:50:42 +08:00
Chalard Jean
318bbccc3e
Merge "Check for FEATURE_TELEPHONY instead of CM" am: 6df94880b3
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1639905
Change-Id: Ibf1b7ccf19781d8caa1bb27e335be2367a6fb658
2021-03-19 01:46:23 +00:00
Paul Hu
25be9509b8
Merge "Fix CS external dependencies on CarrierDefaultApp"
2021-03-19 01:41:25 +00:00
SongFerng Wang
026fa948ae
Merge "KEY_CARRIER_NR_AVAILABILITIES_INT_ARRAY change type as IntArray" into sc-dev
2021-03-19 01:28:31 +00:00
Daniel Huang
408440ed54
Merge "Add configs for IMS Service Entitlement." into sc-dev
2021-03-19 01:22:57 +00:00
TreeHugger Robot
3c05313b04
Merge "[incfs] Use the new libincfs API for file status checking" into sc-dev
2021-03-19 01:19:05 +00:00
Remi NGUYEN VAN
0afced9423
Merge "Add InetAddressCompat" am: b648508ccb am: 23511a3eba
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1645289
Change-Id: I94fef501699aa01c997a03dd24a5a25442075af1
2021-03-19 01:10:06 +00:00
Remi NGUYEN VAN
73d3166547
Merge "Move network selection utils to Connectivity" am: c9f553c7ed am: 295bcd9be7
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1645291
Change-Id: Ia276fc1988baf3240f120682170d6c41ee01839e
2021-03-19 01:09:30 +00:00
Treehugger Robot
6f06dae1c3
Merge "Keystore 2.0: Fix diagnosing invalid key in CipherSpiBase." am: be1b1d5550 am: 1ade004e0f
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1646146
Change-Id: Ibf882ed499ada52633ce22b88c1af931f9064ce3
2021-03-19 01:08:39 +00:00
TreeHugger Robot
b50b960b35
Merge "Add the intent to navigate to MANAGE_MEDIA permission page" into sc-dev
2021-03-19 01:00:40 +00:00
Chalard Jean
6df94880b3
Merge "Check for FEATURE_TELEPHONY instead of CM"
2021-03-19 00:59:04 +00:00
Remi NGUYEN VAN
23511a3eba
Merge "Add InetAddressCompat" am: b648508ccb
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1645289
Change-Id: I6946ca309ae923a637f5e5f0ad73c91b26b3c376
2021-03-19 00:39:34 +00:00
Remi NGUYEN VAN
f790404d2f
Remove Preconditions usage in TestNetworkSpecifier
...
Preconditions is a hidden API utility. It can be easily replace by
inline checks.
Bug: 177046265
Test: m
Change-Id: I3f722075fb9c74e12e40348ba4faad2f0fa67178
2021-03-19 00:35:27 +00:00
Remi NGUYEN VAN
37703094fd
Revert "Revert "Remove connectivity dependency on Preconditions""
...
Preconditions.checkNotNull is deprecated to be replaced by
Objects.requireNonNull, and other methods can easily be replaced by
inline checks.
Preconditions is an internal API class that should not be used by
unbundled jars.
Bug: 177046265
Change-Id: I3a67d266b32142c034520acbcdc30f7213db5e13
Test: m
2021-03-19 00:35:27 +00:00
Remi NGUYEN VAN
295bcd9be7
Merge "Move network selection utils to Connectivity" am: c9f553c7ed
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1645291
Change-Id: I452591707a97b501f189fa9f61e90da842fa3734
2021-03-19 00:35:03 +00:00
Treehugger Robot
1ade004e0f
Merge "Keystore 2.0: Fix diagnosing invalid key in CipherSpiBase." am: be1b1d5550
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1646146
Change-Id: Id4280de7e3f6f6693e0d03c901f4e9665803b92b
2021-03-19 00:31:59 +00:00
Peiyong Lin
c28c4ff016
Merge "Add 90% downscale factors." into sc-dev
2021-03-19 00:29:13 +00:00
Jorge Gil
f134ef3656
Merge "Update the PIP exclusion bounds when PIP is offset by shelf/ime" into sc-dev
2021-03-19 00:12:19 +00:00
Jeff DeCew
a84cafdd58
Merge "Fix an likely ClassCastException in Notification.visitUris" into sc-dev
2021-03-19 00:11:32 +00:00
Jeff Sharkey
d8a9a21a84
Merge "Add flags to <uses-permission> manifest tags." into sc-dev
2021-03-19 00:06:12 +00:00
TreeHugger Robot
065b6513ee
Merge "Fix a bug in RuleIndexingController where StackOverflowError occurs" into sc-dev
2021-03-19 00:05:18 +00:00
Remi NGUYEN VAN
2bf4c58ceb
Add TEST_NETWORK_SERVICE to module API
...
TestNetworkManager is being unbundled; the TEST_NETWORK_SERVICE constant
is necessary for the module to register the manager with
registerContextAwareService.
Bug: 171540887
Test: m
Change-Id: I0690251ddfcdaa8a34830e110b75869a370de389
Merged-In: I0690251ddfcdaa8a34830e110b75869a370de389
2021-03-19 00:04:24 +00:00
Amit Mahajan
1ee17465ec
Clarifying documentation for SliceInfo per API council feedback.
...
Test: none; documentation only change
Bug: 180125761
Change-Id: Ic26598802d0648e7a12ed0ec78c01afc1a72598f
2021-03-18 16:59:45 -07:00
Shuzhen Wang
6001ff0cd1
Merge "Camera: Fix a doc typo" into sc-dev
2021-03-18 23:59:21 +00:00