Treehugger Robot
b7640bf2ed
Merge "Fix typo in comment in android/nfc/tech/Ndef.java" am: 87bc42389d am: d7788c1cd5
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1554496
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I4a6b75f4fc2fd2a47050152cb46da237d76f3e29
2021-01-20 19:38:58 +00:00
Lucas Dupin
45b513fe13
Merge "Remove duplicate import" am: 465c5fde3b am: 4929ff2628
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1553872
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Iebb592bd67e28ed6efa3885ed5bceee7421210c0
2021-01-20 19:38:40 +00:00
Mitch Phillips
a27be856e4
Merge "[MTE] Enable ASYNC MTE in the Zygote." am: b3f5d59011 am: 721e9ef1a1
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1548868
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: If46d61229e06f6125604e8987a0a50a065087b61
2021-01-20 19:38:21 +00:00
Treehugger Robot
d7788c1cd5
Merge "Fix typo in comment in android/nfc/tech/Ndef.java" am: 87bc42389d
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1554496
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I84f74be5c58b46c65fa9fad5da67efb64fe6804a
2021-01-20 18:59:19 +00:00
Lucas Dupin
4929ff2628
Merge "Remove duplicate import" am: 465c5fde3b
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1553872
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I81eb9add86855ed217dbc97436e450eb2be32b1c
2021-01-20 18:55:49 +00:00
Treehugger Robot
87bc42389d
Merge "Fix typo in comment in android/nfc/tech/Ndef.java"
2021-01-20 18:53:40 +00:00
Lucas Dupin
465c5fde3b
Merge "Remove duplicate import"
2021-01-20 18:49:42 +00:00
satayev
311ed3bc6a
Merge "Allow clearing a single change id for tests usage." am: 2805c99594 am: 3bbe9c336f
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1553537
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ie864851627231669743899b8e0d110635cee6c60
2021-01-20 18:49:03 +00:00
Treehugger Robot
7108d008db
Merge "Keystore 2.0 SPI: Use Timestamp from secure clock service" am: f327ea256c am: 5e27a324ac
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1538990
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I8ab6943f450302cca4ae5f898146506c51c75eac
2021-01-20 18:48:40 +00:00
Treehugger Robot
a77d5f7157
Merge "Replace tomcherry@ with dvander@ in OWNERS" am: 63ca6f47f1 am: 7464e2df2a
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1554079
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I9bc5c75ea4b44f08ef723a83d8c18b532b4cae80
2021-01-20 18:48:24 +00:00
Treehugger Robot
9983f044ff
Merge "Always run ensureInAppMountNamespace() to make sure app process runs in its mount namespace" am: 52c968759a am: 0aa41b3b5e
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1554432
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Iea3e49f9330572a66faff640d2343c020d52d3ae
2021-01-20 18:48:14 +00:00
satayev
1c8e894bd8
Merge "Refactor PlatformCompat and related files." am: 5d37ff2d33 am: 3cfd32b11f
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1553536
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ia183bbd2338415608ad962e80336e05bc6d99612
2021-01-20 18:48:02 +00:00
Mitch Phillips
721e9ef1a1
Merge "[MTE] Enable ASYNC MTE in the Zygote." am: b3f5d59011
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1548868
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I1f86bf91667bc2a69a6040b7f7b895ceff47fda5
2021-01-20 18:47:23 +00:00
Frank Li
bd2eb8b1e5
Merge "Deprecated IP connectivity metrics system api" am: 6822a558b2 am: db8bc33ea7
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1549818
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I803c8a23c87706976d4d59bf5cb0fd577ec4b0bd
2021-01-20 18:47:16 +00:00
George Chang
8418eaba20
Merge "Add REQUIRE_UNLOCK_FOR_NFC broadcast to notify SystemUI" am: c76df1366c am: 8feaa187be
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1552500
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ic3b634c879e144db52548035dfe5c80730f21440
2021-01-20 18:47:02 +00:00
Treehugger Robot
36605e338b
Merge "Don't set hdmiPortId for non HDMI device." am: 9923250234 am: a5a278129c
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1554092
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ie11f0ec4204d6c4987f32a9b18e8d632c8448f84
2021-01-20 18:46:49 +00:00
Mitch Phillips
b3f5d59011
Merge "[MTE] Enable ASYNC MTE in the Zygote."
2021-01-20 18:30:07 +00:00
satayev
3bbe9c336f
Merge "Allow clearing a single change id for tests usage." am: 2805c99594
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1553537
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I4a9c218bac4775f5b59c0b8d2c8154f38b0ff4b9
2021-01-20 18:11:39 +00:00
satayev
2805c99594
Merge "Allow clearing a single change id for tests usage."
2021-01-20 17:48:52 +00:00
Treehugger Robot
5e27a324ac
Merge "Keystore 2.0 SPI: Use Timestamp from secure clock service" am: f327ea256c
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1538990
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I83b779a7bc27edd064727bdf9899b7d39345a35d
2021-01-20 16:31:51 +00:00
Treehugger Robot
f327ea256c
Merge "Keystore 2.0 SPI: Use Timestamp from secure clock service"
2021-01-20 16:03:59 +00:00
utzcoz
cf443e3855
Remove duplicate import
...
Test: m
Change-Id: Ia6adcf39af0eeebbeef17069d8b3d74eae542bd4
Signed-off-by: utzcoz <utzcoz@gmail.com >
2021-01-21 00:00:37 +08:00
Treehugger Robot
7464e2df2a
Merge "Replace tomcherry@ with dvander@ in OWNERS" am: 63ca6f47f1
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1554079
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I48278fb2853c925f77fcd97215b5ca9d40a1d293
2021-01-20 15:07:51 +00:00
Treehugger Robot
0aa41b3b5e
Merge "Always run ensureInAppMountNamespace() to make sure app process runs in its mount namespace" am: 52c968759a
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1554432
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I5b6e68606ad584d5fb52c2906b7ccfba6106be64
2021-01-20 14:58:42 +00:00
Treehugger Robot
63ca6f47f1
Merge "Replace tomcherry@ with dvander@ in OWNERS"
2021-01-20 14:55:29 +00:00
satayev
3cfd32b11f
Merge "Refactor PlatformCompat and related files." am: 5d37ff2d33
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1553536
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I662e0813ca02ec8a0fa569a4afde2a7db00a9e6d
2021-01-20 14:51:47 +00:00
Treehugger Robot
52c968759a
Merge "Always run ensureInAppMountNamespace() to make sure app process runs in its mount namespace"
2021-01-20 14:30:30 +00:00
Artur Satayev
21900cb6ee
Allow clearing a single change id for tests usage.
...
Add clearOverrideForTest(changeId, packageName) to remove a single id
from package overrdies.
Bug: 147113465
Test: N/A
Change-Id: I35c6fe418abb9bc562218444878188bc393725e5
2021-01-20 14:15:14 +00:00
satayev
5d37ff2d33
Merge "Refactor PlatformCompat and related files."
2021-01-20 14:13:45 +00:00
Ricky Wai
9408c74699
Always run ensureInAppMountNamespace() to make sure app process runs in its mount namespace
...
ensureInAppMountNamespace() should always run even if mount_data_dirs is false,
as it may still runs BindMountStorageDirs().
Bug: 177821492
Test: Boot without selinux warnings
Change-Id: I08c78be8b32c3c4ba215fb8ac58104795bd8c06c
2021-01-20 12:58:56 +00:00
Frank Li
db8bc33ea7
Merge "Deprecated IP connectivity metrics system api" am: 6822a558b2
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1549818
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I3870ae4c0d034e09b8a644e1e59058ed19242f64
2021-01-20 11:32:26 +00:00
Artur Satayev
5d640c39a3
Refactor PlatformCompat and related files.
...
- Fix java style
- Remove some code duplication
- Remove redundant throws declarations for unchecked exceptions
- Fix javadoc typos
Bug: 147113465
Test: N/A
Change-Id: I723ddf3184e2da77f157340c4ef18e9395b99e60
2021-01-20 11:21:40 +00:00
Frank Li
6822a558b2
Merge "Deprecated IP connectivity metrics system api"
2021-01-20 11:08:30 +00:00
Jakub Pawlowski
90dc908098
Fix typo in comment in android/nfc/tech/Ndef.java
...
Bug: 150104448
Test: none
Change-Id: I4a0c2c8020d42396e5a142d93d24d754a5b32930
2021-01-20 10:38:54 +01:00
lifr
6e6149c471
Deprecated IP connectivity metrics system api
...
- In order to easily maintain the connectivity service.
Refactor the connectivity service by removing all legacy
metrics code & API.
- The commit will deprecate legacy metrics system api.
(The legacy metrics code will be removed in a separate commit.)
Therefore, those legacy metrics event may not be sent in
Android S and above.
Bug: 177043087
Test: atest ConnectivityServiceTest
atest IpConnectivityMetricsTest
atest ConnectivityServiceIntegrationTest
Change-Id: Ia057776869a7d38041b6eaf17904f6c54a7b4fca
2021-01-20 02:06:18 +00:00
George Chang
8feaa187be
Merge "Add REQUIRE_UNLOCK_FOR_NFC broadcast to notify SystemUI" am: c76df1366c
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1552500
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I907024f196e452971f7ba4948aa9a68668a50ede
2021-01-20 02:04:00 +00:00
George Chang
c76df1366c
Merge "Add REQUIRE_UNLOCK_FOR_NFC broadcast to notify SystemUI"
2021-01-20 01:40:57 +00:00
Hall Liu
6ef67bbd6c
resolve merge conflicts of 869fe2b548 to rvc-qpr-dev-plus-aosp
...
Change-Id: Ie60e988df7d0dc1a48bb85e8f5cdfccd549ff319
2021-01-20 01:10:40 +00:00
Treehugger Robot
a5a278129c
Merge "Don't set hdmiPortId for non HDMI device." am: 9923250234
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1554092
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I36cad560a43862c38c3b2749876a7a6fe436c9ad
2021-01-20 00:45:08 +00:00
Treehugger Robot
9923250234
Merge "Don't set hdmiPortId for non HDMI device."
2021-01-19 23:59:10 +00:00
Hall Liu
869fe2b548
Merge "IMS: Add new carrier config." am: 942b71b485
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1409708
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I6c25528234d5a822f60dc853ce3131a6b946e9db
2021-01-19 22:58:45 +00:00
Janis Danisevskis
73326c9ebe
Merge "Integrate IKeystoreAuthorization aidl's addAuthToken with Keystore SPI." am: 9740651028 am: fc80cfcd25
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1553976
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I5bfa045c05804e86f471194b57a272eae47ec7cb
2021-01-19 22:44:15 +00:00
Treehugger Robot
e577801dbf
Merge "AbsSeekBar: Fix growRect computation" am: e1f0416a17 am: 48b3ec73d9
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1550782
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I8c779db0fcf2090ed6e6e624ad91279eaad19bf3
2021-01-19 22:44:04 +00:00
Treehugger Robot
d65928539b
Merge "Make me an owner of accessibility frameworks" am: f79a0fd564 am: b8ec02815b
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1553965
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ic7d1237a3f2b08f6ce6017e29b189f1331b61bba
2021-01-19 22:43:42 +00:00
Hall Liu
942b71b485
Merge "IMS: Add new carrier config."
2021-01-19 22:36:43 +00:00
Janis Danisevskis
fc80cfcd25
Merge "Integrate IKeystoreAuthorization aidl's addAuthToken with Keystore SPI." am: 9740651028
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1553976
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I849473e45708f790328dc01e2ae098741673382e
2021-01-19 21:51:30 +00:00
Treehugger Robot
48b3ec73d9
Merge "AbsSeekBar: Fix growRect computation" am: e1f0416a17
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1550782
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I7d9f55ad046f6bdd76ad68fd14a390cf092870bd
2021-01-19 21:48:24 +00:00
Treehugger Robot
b8ec02815b
Merge "Make me an owner of accessibility frameworks" am: f79a0fd564
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1553965
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I4424122646e744635132704d67c00b5135f80f24
2021-01-19 21:45:00 +00:00
Henry Fang
2f4cec96c5
Don't set hdmiPortId for non HDMI device.
...
bug: 142698113
Test: Manaul
Change-Id: I2876dacb07e4ebb4ed43c5e95b14ab84c8d935cb
2021-01-19 13:40:57 -08:00
Janis Danisevskis
9740651028
Merge "Integrate IKeystoreAuthorization aidl's addAuthToken with Keystore SPI."
2021-01-19 21:10:46 +00:00