Commit Graph

745049 Commits

Author SHA1 Message Date
TreeHugger Robot
d44f10236a Merge changes from topic "no-dhcpresults"
* changes:
  [automerge] Delete DhcpResults from frameworks/base. 2p: a2ea37e61e
  Delete DhcpResults from frameworks/base.
2022-02-07 05:53:10 +00:00
Remi NGUYEN VAN
6980cde567 Merge "Remove @hide usage in DataUsageUtilsTest" 2022-02-07 05:36:49 +00:00
Yohei Yukawa
820dfbb086 Merge "Clarify which InputMethodManagerInternal method takes lock internally" 2022-02-07 04:55:43 +00:00
Remi NGUYEN VAN
11f0f946fc Merge "Remove @hide usage and fix NetworkPolicy backup" 2022-02-07 04:42:22 +00:00
Remi NGUYEN VAN
ead51323d4 Merge changes from topic "ns_core_visibility"
* changes:
  Delete NetworkStatsFactoryBenchmark
  Allow core tests to use hidden connectivity API
2022-02-07 04:41:46 +00:00
TreeHugger Robot
472bc8d932 Merge "Changes the interpretations to icon vlues" 2022-02-07 03:32:02 +00:00
Remi NGUYEN VAN
e839e63d21 Remove @hide usage and fix NetworkPolicy backup
Remove usage of hidden symbols for network stats APIs, replacing them
with public API alternatives.

Also fix backup of NetworkPolicy when the set of subscriber IDs is
empty. This as not caught because the test used a hidden API builder
that creates a non-empty set containing null.

Bug: 197717846
Test: atest FrameworksCoreTests
Change-Id: I45a98795c571ac97bd6025988da156bd06d57e45
2022-02-07 11:45:12 +09:00
Remi NGUYEN VAN
8c67bb002a Delete NetworkStatsFactoryBenchmark
As commented in the test, it is broken today and barely builds.

Nothing seems to be referencing this library anywhere: remove it.

Ignore-AOSP-First: submitting in AOSP separately from topic
Bug: 197717846
Test: m
Change-Id: I0dd12dfd3f9bf99c9723d58e2dc656ea7db3a1f3
2022-02-07 11:12:16 +09:00
Remi NGUYEN VAN
3a11e3e22c Remove @hide usage in DataUsageUtilsTest
Replace matchesSubscriberId with an equivalent check based on the stable
API getSubscriberIds().

Bug: 197717846
Test: atest DataUsageUtilsTest
Change-Id: Icf86598dc2e4e8b24e08135de8a842f52ac4ab5b
2022-02-07 11:06:53 +09:00
Steve Elliott
a37504d3eb Merge "Asynchronous notif pipeline evaluation" 2022-02-07 01:22:25 +00:00
Remi NGUYEN VAN
603c4fa739 Allow core tests to use hidden connectivity API
The tests currently use hidden connectivity APIs to exercise network
stats for bandwidth or benchmarking tests.

Bug: 197717846
Test: m
Change-Id: I8f84d57360da34315d2388cb71b3d3738b4f483e
2022-02-07 10:09:15 +09:00
rickywai
6eba9508d5 Merge "Check the data directory before mount tmpfs" am: 767c2ba770 am: fc0e10b210 am: ca74c56e3a am: c5e501a6bd
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1771085

Change-Id: I3a2788e11492fff7f8303725762b0cd84bff39ed
2022-02-07 00:07:52 +00:00
rickywai
c5e501a6bd Merge "Check the data directory before mount tmpfs" am: 767c2ba770 am: fc0e10b210 am: ca74c56e3a
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1771085

Change-Id: I952a9842c064bc7faf2245ba5fa95bfce8881e3b
2022-02-06 23:53:34 +00:00
rickywai
ca74c56e3a Merge "Check the data directory before mount tmpfs" am: 767c2ba770 am: fc0e10b210
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1771085

Change-Id: I75ec659199b4b892c60b44aa8ba36f68fc1b74e4
2022-02-06 23:40:48 +00:00
rickywai
fc0e10b210 Merge "Check the data directory before mount tmpfs" am: 767c2ba770
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1771085

Change-Id: I912c3a576a4e4e7d14307bae56b4452050786e5e
2022-02-06 23:29:22 +00:00
rickywai
767c2ba770 Merge "Check the data directory before mount tmpfs" 2022-02-06 23:14:37 +00:00
TreeHugger Robot
2ccaf53cd7 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: 574c12fb0e -s ours am: 0510b50533 -s ours am: 234e65122f -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16795055

Change-Id: I9cdfba89dcd29923d6a239e5f4a159f47298f90a
2022-02-06 07:51:50 +00:00
TreeHugger Robot
9e3419b6bc [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: b04c4f57e4 -s ours am: 99d68fe23c -s ours am: f234082a97 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16794561

Change-Id: I6bb82c61c26bc4a8287a92b2231f25d76851aefd
2022-02-06 07:51:30 +00:00
TreeHugger Robot
844635e7df [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: 6830e6f622 -s ours am: 61495b90ea -s ours am: b297c87eee -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16796006

Change-Id: I079071bfe267869ccb6f6a01e916395020705e53
2022-02-06 07:51:09 +00:00
TreeHugger Robot
f3633573b4 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: 79b7936bb6 -s ours am: 5e3dd00c75 -s ours am: ecbb802e13 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16795127

Change-Id: If4b2ebb33f9868b13ba18078ad257d7a5acbe461
2022-02-06 07:50:47 +00:00
TreeHugger Robot
2db08bcc8a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: 8df23efae2 -s ours am: 86cfd786db -s ours am: b64129fc03 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16795049

Change-Id: I31571a16ebd0feea4a689fc89bda01501c7f1798
2022-02-06 07:50:24 +00:00
TreeHugger Robot
234e65122f [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: 574c12fb0e -s ours am: 0510b50533 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16795055

Change-Id: Ie0247ef5f356dba01730be3aac5ec34a87a4613f
2022-02-06 07:47:13 +00:00
TreeHugger Robot
f234082a97 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: b04c4f57e4 -s ours am: 99d68fe23c -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16794561

Change-Id: Iffab89a3f74e8f4940a7e86b721a378624ab81e5
2022-02-06 07:46:45 +00:00
TreeHugger Robot
b297c87eee [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: 6830e6f622 -s ours am: 61495b90ea -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16796006

Change-Id: I2b7731d42a9b4726794542a0e37cf4bce4b6f153
2022-02-06 07:46:35 +00:00
TreeHugger Robot
ecbb802e13 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: 79b7936bb6 -s ours am: 5e3dd00c75 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16795127

Change-Id: Icac5fbe7652ec16fce1241746b41c929931fbbe5
2022-02-06 07:45:55 +00:00
TreeHugger Robot
b64129fc03 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: 8df23efae2 -s ours am: 86cfd786db -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16795049

Change-Id: Id5e7f7280a4335ea2dde8818f78a4e45df27a238
2022-02-06 07:45:05 +00:00
TreeHugger Robot
1b82bbff40 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: 574c12fb0e -s ours am: f63d69c9b6 -s ours am: 187cead3fe -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16795055

Change-Id: I29c37766d778b6d243a81184c74cdd74e0d79b5f
2022-02-06 07:36:26 +00:00
TreeHugger Robot
a732f790b0 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: b04c4f57e4 -s ours am: e930d6db74 -s ours am: 8f0c1cf787 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16794561

Change-Id: Id3b9b010b5e00472ccf1cbbf3d0468ac6da2b070
2022-02-06 07:36:12 +00:00
TreeHugger Robot
a08ee5d6ea [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: 6830e6f622 -s ours am: f2096fc4d5 -s ours am: 54806d98eb -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16796006

Change-Id: Id78cbcadd84ff3d90028e24325cc3e74ae5c104b
2022-02-06 07:35:44 +00:00
TreeHugger Robot
187cead3fe [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: 574c12fb0e -s ours am: f63d69c9b6 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16795055

Change-Id: Ib34ae8638dc7b5891d090c250a497f9dcb8617c8
2022-02-06 07:35:29 +00:00
TreeHugger Robot
8d27349601 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: 79b7936bb6 -s ours am: 52b4c166ec -s ours am: 956df0242b -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16795127

Change-Id: I1df81a1e4d7375b9a506aecc2a0f61978f515b4b
2022-02-06 07:35:29 +00:00
TreeHugger Robot
8f0c1cf787 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: b04c4f57e4 -s ours am: e930d6db74 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16794561

Change-Id: I5823e98128ed71ab8d776767ffb925373c6cf5bc
2022-02-06 07:35:17 +00:00
TreeHugger Robot
3d385366da [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: 8df23efae2 -s ours am: b57b1f6a52 -s ours am: d2d196cd8e -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16795049

Change-Id: Iafb0bbcdb5a7a608e2ed143d3c6a555fbdb6f34c
2022-02-06 07:35:10 +00:00
TreeHugger Robot
aa7afb44f0 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 351b259381 -s ours am: 4ccd827e9f -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16795130

Change-Id: I9d3e642640570d9c0de1d70a67cc6bd5db0d6da6
2022-02-06 07:34:35 +00:00
Automerger Merge Worker
3b539dc2c1 Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: c39b340f75 -s ours am: 88ae4290e2 -s ours" 2022-02-06 07:34:27 +00:00
TreeHugger Robot
54806d98eb [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: 6830e6f622 -s ours am: f2096fc4d5 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16796006

Change-Id: Ie274c767578b78573600e817e7aced8e074cbc93
2022-02-06 07:34:25 +00:00
Automerger Merge Worker
e8cd02ef92 Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 67e4b07e88 -s ours" 2022-02-06 07:34:19 +00:00
TreeHugger Robot
4e4e4531ac [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: c39b340f75 -s ours am: 88ae4290e2 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16794255

Change-Id: I798e2ff3cf551cb5737f8df5f5ab0384bf70dd4b
2022-02-06 07:34:16 +00:00
TreeHugger Robot
bfa5436892 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: aa28142051 -s ours am: 7feedc964b -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16796063

Change-Id: I32079ea51a52959510df4ee02afefb4fb7b3a823
2022-02-06 07:33:57 +00:00
TreeHugger Robot
68c4d748bc [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 67e4b07e88 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16795053

Change-Id: I3e0f732ea2c0fb7e5246cb9381afb5ca32c6c91e
2022-02-06 07:33:54 +00:00
TreeHugger Robot
39ae4ed2a6 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: a1643d8b6c -s ours am: 103224c5e6 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16796071

Change-Id: Ic09a691f969cf28a7c1fdcf34552a0f7fe500d9d
2022-02-06 07:33:19 +00:00
TreeHugger Robot
dadf54a99f Merge changes from topic "presubmit-am-5b9f2922fa9546d3a2b12257b37cc383" into sc-v2-dev-plus-aosp am: 8c495e756c
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16795130

Change-Id: I05f8818ddbef404b81af48d3a897968c4346e004
2022-02-06 07:32:54 +00:00
Bill Yi
0e79ba472f [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 1f4adf67ed am: ef572ac6e2 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16795130

Change-Id: I07eabff886ad715ccf3fe782020bc5a5b6611e24
2022-02-06 07:32:43 +00:00
TreeHugger Robot
81575eb995 Merge changes from topic "presubmit-am-33ac336a7d3741dbb0bbc3da402c79a4" into sc-v2-dev-plus-aosp am: 857aad671c
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16794255

Change-Id: I1e14687b584ec5af0b156087acb98bdabb64bf47
2022-02-06 07:31:57 +00:00
TreeHugger Robot
f63d69c9b6 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: 574c12fb0e -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16795055

Change-Id: I604ba5315dd2b45b0da0db331379efb87986165a
2022-02-06 07:31:55 +00:00
TreeHugger Robot
e930d6db74 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: b04c4f57e4 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16794561

Change-Id: I28155e895e9d621c50bb5c65cd56df543d6938bd
2022-02-06 07:31:43 +00:00
TreeHugger Robot
0510b50533 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: 574c12fb0e -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16795055

Change-Id: I2a9de992d864abb3cf446130f14a8100d894e215
2022-02-06 07:31:38 +00:00
TreeHugger Robot
f2096fc4d5 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: 6830e6f622 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16796006

Change-Id: Ic274aac4030b56665c20fc4cfdc483693765f0e3
2022-02-06 07:31:37 +00:00
Bill Yi
cc8c7db866 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 964d06032e am: 15aea1d6fc -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16794255

Change-Id: I513009afcb355f45d65e59a477b38a7909b76296
2022-02-06 07:31:33 +00:00
TreeHugger Robot
99d68fe23c [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: b04c4f57e4 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16794561

Change-Id: I9bd1eee9d26d67f2e2bae84c1ff05d7b6cb00e00
2022-02-06 07:31:24 +00:00