Commits · 4bd67ddfa94c49551c311052745a63c38b420246 · Farzin Kazemzadeh / platform_frameworks_base-old

Feb 09, 2021

Merge changes from topic "removeNI" am: am: · 4bd67ddf

Junyu Lai authored 4 years ago

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iec45cb7f553f08e4e3ec91827964a8eec8f96a91

4bd67ddf

Merge changes from topic "removeNI" am: · bd414490

Junyu Lai authored 4 years ago

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia7c6e3bf8f10b98fc2c4d83d41e65c64737753f0

bd414490

Merge "Rename SignalThresholdInfo.Builder#setThresholdUnlimited" am: am: · 35fbb8cb

Rambo Wang authored 4 years ago

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic9779453b960ce81c46555d2fd440d04eba3147c

35fbb8cb

Merge changes from topic "removeNI" · c2d62406

Junyu Lai authored 4 years ago

* changes:
  [FUI07] Stop making NetworkState with NetworkInfo from external callers
  [FUI06] Stop using NetworkInfo in NetworkState from external callers

c2d62406

Merge "Rename SignalThresholdInfo.Builder#setThresholdUnlimited" am: · 54a0c76e

Rambo Wang authored 4 years ago

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1a3ee8037a712e474a335b77fb5c8a3873fd599e

54a0c76e

Merge "Rename SignalThresholdInfo.Builder#setThresholdUnlimited" · 31083c40
Rambo Wang authored 4 years ago

31083c40

Merge "Specify version for aidl_interface explicitly" am: am: · bd0e762d

Treehugger Robot authored 4 years ago

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Idd7b735da71f7beebc7976ae0a3bd33b98b0020c

bd0e762d

Merge "Specify version for aidl_interface explicitly" am: · 8add53a3

Treehugger Robot authored 4 years ago

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4076bf928aa7f335b16aace695099b4aac1b5cff

8add53a3

[automerger skipped] Merge "Fix the the proto definition for app startup and... · 398301fd

TreeHugger Robot authored 4 years ago

[automerger skipped] Merge "Fix the the proto definition for app startup and fully drawn events." into rvc-qpr-dev am: d41c1196 -s ours

am skip reason: Change-Id I36ec354d273dceace5245d7634c68ac63dc5a8cd with SHA-1 5d230a2d is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9ff7e078ff624bd119ee3923da13b852e304d84a

398301fd

Merge "Fix the the proto definition for app startup and fully drawn events." into rvc-qpr-dev · d41c1196
TreeHugger Robot authored 4 years ago

d41c1196

Merge "Implement SessionHandle.hashCode()" am: am: · c2870a24

Brian Stack authored 4 years ago

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I736db34d257026030a4eb69ef446f1218db825b2

c2870a24

Merge "Specify version for aidl_interface explicitly" · 5968a390
Treehugger Robot authored 4 years ago

5968a390

Feb 08, 2021

Merge "Implement SessionHandle.hashCode()" am: · 1042b484

Brian Stack authored 4 years ago

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Idbb8d51ea12469756df0e6cdd60d3a187d51d20a

1042b484

Fix the the proto definition for app startup and fully drawn events. · 6b232cc0

Calin Juravle authored 4 years ago

ActivityMetricsLoggers build the proto with the compilation reason first
and then the compilation filter. Instead of changing the logging code,
we prefer to change the proto field order: this will facilitate the
speed up the resolution without the need to purge data or wait for
further release builds.

It is ok, because both fields are in fact int32 proto values so the ABI
does not change.

Test: m
Bug: 178108751

(cherry picked from commit cf676e8028c2611461dc3e009dd9fe771f44bdb2)

Merged-In: I36ec354d273dceace5245d7634c68ac63dc5a8cd
Change-Id: I03c701efe2181ae7796547267902f884007593eb

6b232cc0

Merge "Implement SessionHandle.hashCode()" · 033681de
Brian Stack authored 4 years ago

033681de

Merge "[VCN07] Bypass VCN for non-internet app accessible cellular services"... · 07c1f366

Junyu Lai authored 4 years ago

Merge "[VCN07] Bypass VCN for non-internet app accessible cellular services" am: 95f5889a am: ad80cba0

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4ad38ac5450b06da70f9fd329d79014e352e1656

07c1f366

Merge "[VCN07] Bypass VCN for non-internet app accessible cellular services" am: · ad80cba0

Junyu Lai authored 4 years ago

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I304db5e46d8e76d7248b9dd1f42b43200635b2be

ad80cba0

Merge changes I414dce58,I165716a0,I101d8949 am: am: · fd162457

Benedict Wong authored 4 years ago

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I50e6823a87f02341cd9886d1817e10006c16346a

fd162457

Merge "[VCN07] Bypass VCN for non-internet app accessible cellular services" · 95f5889a
Junyu Lai authored 4 years ago

95f5889a

Merge changes I414dce58,I165716a0,I101d8949 am: · 890114ac

Benedict Wong authored 4 years ago

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9fcbb5278fd223a951349ffefb49d366c683d827

890114ac

Implement SessionHandle.hashCode() · 7d487f40

Brian Stack authored 4 years ago

Bug: 178807258
Test: atest UwbManagerTests
Change-Id: Ib3d518c136282393f4f3bb06388404f76fad5b73

7d487f40

Merge "Add Volume Control UUID" am: am: · a42efdda

Jakub Pawlowski authored 4 years ago

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie29ebf878b030e8c18c08ceb545ea8e1b4a3026f

a42efdda

Merge changes I414dce58,I165716a0,I101d8949 · 02fe346e

Benedict Wong authored 4 years ago

* changes:
  Implement RetryTimeout state
  Test Network startup in ConnectedState
  VDBG guard common verbose logging in Vcn

02fe346e

Merge "Add Volume Control UUID" am: · de206f8a

Jakub Pawlowski authored 4 years ago

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I28c62a284b70c58b7f50de139788c1f5a4332106

de206f8a

Merge "ConnectivityService: Plumb attribution tag for location permission... · 94404471

Roshan Pius authored 4 years ago

Merge "ConnectivityService: Plumb attribution tag for location permission checks" am: 482b2dda am: 74371a29

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I656644b786bccbe03cdb93a37a0f47e12e5c330d

94404471

Merge "[MTE] Parse MTE sysprop in system_server" am: am: · e399fb29

Mitch Phillips authored 4 years ago

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I43d5a38c75adbda0553e81235f49aa0aef7a8a3b

e399fb29

Merge "Add OWNERS for CPU-related files" am: am: · 0192f22a

Jeff Sharkey authored 4 years ago

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ifbe90565c3df31a79bafa5a958a4df1ac1192fb0

0192f22a

Merge "Add Volume Control UUID" · c50447ad
Jakub Pawlowski authored 4 years ago

c50447ad

Add Volume Control UUID · ebb62d5d

Łukasz Rymanowski authored 4 years ago

Sponsor: jpawlowski@
Test: compilation
Bug: 159786353
Tag: #feature

Change-Id: I14116848411026ceab0ee15098687bf821e74d38

ebb62d5d

Merge "ConnectivityService: Plumb attribution tag for location permission checks" am: · 74371a29

Roshan Pius authored 4 years ago

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5150c4827d8d2a8154afdf4f7076846fe6e38630

74371a29

Merge "[MTE] Parse MTE sysprop in system_server" am: · b00646e9

Mitch Phillips authored 4 years ago

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I08b48cb584c9cd727a23457721a50ae4a8b1a2e6

b00646e9

Merge "Add OWNERS for CPU-related files" am: · 808b6d89

Jeff Sharkey authored 4 years ago

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5facab8fdf100bfcd7adbfc89d97e9d966d75ffc

808b6d89

Merge "ConnectivityService: Plumb attribution tag for location permission checks" · 482b2dda
Roshan Pius authored 4 years ago

482b2dda
Merge "[MTE] Parse MTE sysprop in system_server" · 4d7b7a71
Mitch Phillips authored 4 years ago

4d7b7a71

Merge "Introduce TracingServiceProxy System Services" am: am: · 0f7ec99e

Collin Fijalkovich authored 4 years ago

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib422d8a8f8e303d37e1c778c7c21dad27f0f5958

0f7ec99e

[automerger skipped] Merge "resolve merge conflicts of... · 97646fd3

TreeHugger Robot authored 4 years ago

[automerger skipped] Merge "resolve merge conflicts of a13fc7f3 to qt-qpr1-dev" into qt-qpr1-dev am: 6d4ff2e0 -s ours am: 2fffbcb7 -s ours am: ed6a6324 -s ours

am skip reason: Change-Id I03072c65e1c7101538a7a20541d2ac59a2d213e3 with SHA-1 296fea74 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8c69b86e015985b902508a3f6933ddaf12a24d6c

97646fd3

Merge "Add OWNERS for CPU-related files" · 1cf122b5
Jeff Sharkey authored 4 years ago

1cf122b5

Merge "Introduce TracingServiceProxy System Services" am: · a8d0cc25

Collin Fijalkovich authored 4 years ago

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0beefb006286785dcc84bed138921d87992fbf87

a8d0cc25

Merge "Keystore 2.0 SPI: Add CERTIFICATE_* tags." am: am: · fccde53e

Janis Danisevskis authored 4 years ago

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I46e4bf75482d4366fa852ce0708483beddd32fdd

fccde53e

Merge "Add resource owners" am: am: · 5195eb9a

Jeff Sharkey authored 4 years ago

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1d3562d61b9a663a5911df18230867652d56ce51

5195eb9a