Commit Graph

565342 Commits

Author SHA1 Message Date
Jeff Sharkey
d79742cf86 Merge "Add OWNERS file for ConnTestApp." am: bc447056c0 am: 0697cb551d
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1586727

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ibdb3e1663ad226297ee782ab5bb9427ddf07808b
2021-02-12 16:51:57 +00:00
Jeff Sharkey
0697cb551d Merge "Add OWNERS file for ConnTestApp." am: bc447056c0
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1586727

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2c695b43cbc4ad7c6154d9c1f0b227695b06f68a
2021-02-12 16:14:07 +00:00
Jeff Sharkey
bc447056c0 Merge "Add OWNERS file for ConnTestApp." 2021-02-12 15:54:56 +00:00
Almaz Mingaleev
d44c45515f Merge "Prioritise NTP over NITZ in time detection." am: a36c8d2b6a am: fe18f9b37f
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1563678

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4ac4bb6cd48c9be18062a1f34a4f73449d828b3a
2021-02-12 09:19:17 +00:00
Sudheer Shanka
b632d34728 Add OWNERS file for ConnTestApp.
Bug: n/a
Test: n/a
Change-Id: I0c6730fdf7b9bf5ebd8c907cb8a71630725e67e6
2021-02-12 09:16:43 +00:00
Almaz Mingaleev
fe18f9b37f Merge "Prioritise NTP over NITZ in time detection." am: a36c8d2b6a
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1563678

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8f21f8288cee454ddabd06844d038041cef8afc4
2021-02-12 08:31:22 +00:00
Almaz Mingaleev
a36c8d2b6a Merge "Prioritise NTP over NITZ in time detection." 2021-02-12 08:10:37 +00:00
Treehugger Robot
a317c76041 Merge "Remove unnecessary calls to JNIEnv::GetArrayLength" am: da21df3a17 am: fffec9a0e0
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1584521

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7213469d10ff16139055498e7229c7019fa38d7c
2021-02-12 05:49:05 +00:00
Treehugger Robot
2bdb30ea8f Merge "Stop using Slog in QosCallbackTracker." am: 564aecdefb am: 5ff0e00e37
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1585567

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I25baa31f1d7d148a78e29ae46a152b6b5e245d0b
2021-02-12 05:48:35 +00:00
Treehugger Robot
fffec9a0e0 Merge "Remove unnecessary calls to JNIEnv::GetArrayLength" am: da21df3a17
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1584521

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Icd7b1191f89eb166bf3cba3c63782b0675101bd4
2021-02-12 05:21:48 +00:00
Treehugger Robot
5ff0e00e37 Merge "Stop using Slog in QosCallbackTracker." am: 564aecdefb
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1585567

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6df42ce17addb1f433eba440ba4593b2e4ca57e5
2021-02-12 05:18:13 +00:00
Treehugger Robot
da21df3a17 Merge "Remove unnecessary calls to JNIEnv::GetArrayLength" 2021-02-12 04:48:47 +00:00
Treehugger Robot
564aecdefb Merge "Stop using Slog in QosCallbackTracker." 2021-02-12 04:03:12 +00:00
Suren Baghdasaryan
9530beb872 Merge "Extend getPssPid to report itemized memtrack values" am: ca115f206a am: b641d098da
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1583743

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I765a38882426e933fdc3c3cdebdffb55f3be2209
2021-02-12 02:21:08 +00:00
Suren Baghdasaryan
b641d098da Merge "Extend getPssPid to report itemized memtrack values" am: ca115f206a
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1583743

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia9822d0eda68f02a5297a5e9d22cc9a6f0f1289c
2021-02-12 01:46:16 +00:00
Lorenzo Colitti
9d2c3ee808 Stop using Slog in QosCallbackTracker.
This is not public API. Use Log instead.

Test: m
Fix: 172050541
Change-Id: I281831431e2edcf9a3b77122ad8736b94aa8e215
2021-02-12 01:40:06 +00:00
Suren Baghdasaryan
0c13c67158 Remove unnecessary calls to JNIEnv::GetArrayLength
Replace repeated calls to JNIEnv::GetArrayLength operating on the same
array with a cached value obtained once and then reused.

Bug: 165832481
Signed-off-by: Suren Baghdasaryan <surenb@google.com>
Change-Id: Id85f887a9a4dc8eeacbb047beca7ced49853484e
2021-02-12 01:12:44 +00:00
Suren Baghdasaryan
ca115f206a Merge "Extend getPssPid to report itemized memtrack values" 2021-02-12 01:11:55 +00:00
Suren Baghdasaryan
c17cbb303c Extend getPssPid to report itemized memtrack values
Currently getPssPid includes memtrack HAL reported values in the pss
calculation. This makes it impossible to get these values separately.
Extend this interface to include itemized memtrack values.

Bug: 165832481
Test: dumpsys meminfo
Signed-off-by: Suren Baghdasaryan <surenb@google.com>
Change-Id: Ieb7e1b79ad8ecae6023338d9992467952558e2bd
2021-02-12 01:11:39 +00:00
Daniel Bright
308f5080bd Merge "Changed ApnThrottleStatus to ThrottleStatus" am: 9379af7c56 am: ce0ac6794a
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1581424

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ifb8ca010023526051a6a18a091002d189cd5254f
2021-02-12 00:43:29 +00:00
Daniel Bright
ce0ac6794a Merge "Changed ApnThrottleStatus to ThrottleStatus" am: 9379af7c56
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1581424

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I345294e2a00e8ffe370b96cc9c6a821add304369
2021-02-12 00:13:06 +00:00
Daniel Bright
9379af7c56 Merge "Changed ApnThrottleStatus to ThrottleStatus" 2021-02-11 23:31:24 +00:00
Philip P. Moltmann
39198ddd84 Merge "Remove me from OWNERS files" am: 25ee5a7fb7 am: bf8de269cb
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1573324

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ibe2c5fd92070b1aebdc46755c8667b3ed22348ab
2021-02-11 22:57:48 +00:00
Tianjie Xu
bc71ae1489 Merge "Delay loadEscrowData from locksettings" am: 60edeec07e am: cd9d960d23
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1566555

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6ea608a47dc07a2cd96b5c6d1e9dfd4c42f366df
2021-02-11 22:57:36 +00:00
Philip P. Moltmann
bf8de269cb Merge "Remove me from OWNERS files" am: 25ee5a7fb7
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1573324

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8973d535d7c6951e0c0c80bedab50903d8db565e
2021-02-11 22:42:07 +00:00
Tianjie Xu
cd9d960d23 Merge "Delay loadEscrowData from locksettings" am: 60edeec07e
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1566555

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0ef3ce66e9771bc8864c84c91330c2947a74c673
2021-02-11 22:35:37 +00:00
Philip P. Moltmann
25ee5a7fb7 Merge "Remove me from OWNERS files" 2021-02-11 22:29:07 +00:00
Philip P. Moltmann
a8eb3d3e69 Remove me from OWNERS files
Test: n/a
Change-Id: I6113011e6ab0997285d5b7a86303fc60a3b98a2b
Exempt-From-Owner-Approval: Previously approved
2021-02-11 22:28:43 +00:00
Tianjie Xu
60edeec07e Merge "Delay loadEscrowData from locksettings" 2021-02-11 21:52:11 +00:00
Tianjie
1c98980d00 Delay loadEscrowData from locksettings
For server-based ror, we want to deplay loadEscrowData until
1. Binding to Gmscore works
2. Network is available

So we factor out the loadEscrowData to be called later in the
start sequence of system server. Also make the function async
so that we can retry on temporarily failures.

Bug: 172780686
Test: run server based ror

Change-Id: If71f8974f94eb1be2ab896e95601377196e01790
2021-02-11 21:52:01 +00:00
Janis Danisevskis
9112917eb8 Merge "Adding device ID attestation to KeyGenParameterSpec" am: 3faed136d5 am: 0072df0d03
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1554667

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2847baa64bdc5c2b949c5e87f6bffb1ad4986bea
2021-02-11 21:08:55 +00:00
Daniel Bright
a5a88fd3e8 Changed ApnThrottleStatus to ThrottleStatus
* Changed verbiage to be more generic at request of the API council

Bug: 175092152
Test: make & flash
Merged-In: I8bec64b0c38be94bcd3f3b99bcebfb378384c970
Change-Id: I8bec64b0c38be94bcd3f3b99bcebfb378384c970
2021-02-11 13:02:19 -08:00
Janis Danisevskis
0072df0d03 Merge "Adding device ID attestation to KeyGenParameterSpec" am: 3faed136d5
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1554667

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2736d762f4b3675a2c6471c07ec79e0fd09c2864
2021-02-11 20:27:17 +00:00
Janis Danisevskis
3faed136d5 Merge "Adding device ID attestation to KeyGenParameterSpec" 2021-02-11 20:03:01 +00:00
Winson
68c83e6346 Parcel queriesProviders in ParsingPackageImpl am: 985d71551d
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13554511

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I346dbe05f1319f24af7b8fd36ebc26eee1e379bc
2021-02-11 19:42:12 +00:00
Winson
985d71551d Parcel queriesProviders in ParsingPackageImpl
This was broken in the original migration, causing this field to be
dropped on reboot.

Bug: 178209505

Test: TODO, separate change will include comprehensive parceling test

Change-Id: I67219fe00c7b92677391fd46305bf0424d74e5f3
(cherry picked from commit 00f69942be)
2021-02-11 16:57:08 +00:00
Roland Levillain
c455df115b Merge changes from topic "int32ref" am: 2d29d2d82b am: 4212e4479f
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1566390

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8511efa59e8d8617f48d62ee52d9e7ae15458253
2021-02-11 13:06:09 +00:00
Daulet Zhanguzin
be67bbad65 Use public android.system.Int64Ref instead of Int32Ref which is hidden (CorePlatformApi) type of am: 3f22cb1106 am: 612b33fa9a
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1582887

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id8fbbbc5f4f25998fb2ae8c42c5e0392c18f9510
2021-02-11 13:06:03 +00:00
Roland Levillain
4212e4479f Merge changes from topic "int32ref" am: 2d29d2d82b
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1566390

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I86dde2fef971759b4720cfb242e8954baacf9d84
2021-02-11 12:43:56 +00:00
Daulet Zhanguzin
612b33fa9a Use public android.system.Int64Ref instead of Int32Ref which is hidden (CorePlatformApi) type of am: 3f22cb1106
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1582887

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iab4679528ce95ee246b6f2ff0dd0038b6e6a4b35
2021-02-11 12:42:35 +00:00
Roland Levillain
2d29d2d82b Merge changes from topic "int32ref"
* changes:
  [Mainline] android.system package APIs migration
  Use public android.system.Int64Ref instead of Int32Ref which is hidden (CorePlatformApi) type of libcore
2021-02-11 12:05:36 +00:00
Grace Jia
b609dab7b7 Merge "Set default value of EXTRA_ADD_SELF_MANAGED_CALLS_TO_INCALLSERVICE true." am: f67a99fe60 am: a8cafc65ff
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1571460

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I487626731aed71285fa359470b01e4227f5162c4
2021-02-11 03:48:52 +00:00
Grace Jia
a8cafc65ff Merge "Set default value of EXTRA_ADD_SELF_MANAGED_CALLS_TO_INCALLSERVICE true." am: f67a99fe60
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1571460

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0a7a05d26765f15a07f8882def2cfffdc613fd81
2021-02-11 03:36:32 +00:00
Treehugger Robot
8b5269dd90 Merge "Add OWNERS file for provider tests" am: 8aad810051 am: 1b31fd8a96
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1576395

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I548c61d860441c5028de5b58e9e4e3750fcdaef2
2021-02-11 03:36:20 +00:00
Grace Jia
f67a99fe60 Merge "Set default value of EXTRA_ADD_SELF_MANAGED_CALLS_TO_INCALLSERVICE true." 2021-02-11 03:23:42 +00:00
Treehugger Robot
1b31fd8a96 Merge "Add OWNERS file for provider tests" am: 8aad810051
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1576395

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2dc2080fa07b91855d3ee41e11f26f391a7a60ff
2021-02-11 02:47:57 +00:00
Calin Juravle
cfdc5df93c Merge "Use the same reason for OTAs and First Boots" am: 274d200460 am: dbbebbe0a1
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1573881

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ibc7ef2f65ed04ddc97c5fe27f33f5b2a5a23f127
2021-02-11 02:47:25 +00:00
Treehugger Robot
8aad810051 Merge "Add OWNERS file for provider tests" 2021-02-11 02:28:40 +00:00
Calin Juravle
dbbebbe0a1 Merge "Use the same reason for OTAs and First Boots" am: 274d200460
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1573881

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7886572a64c84161273ed8c01d6c511265a784dc
2021-02-11 02:23:10 +00:00
Calin Juravle
274d200460 Merge "Use the same reason for OTAs and First Boots" 2021-02-11 02:07:59 +00:00