Commits · 097aabdbefe2218b3b70e0c9e99ba60f7b38d65f · Farzin Kazemzadeh / platform_frameworks_base-old

Jan 21, 2021

Merge "Check slot in reboot function" am: am: am: · 097aabdb

Tianjie Xu authored 4 years ago

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9f3568bf1c225ed9b9e498c0ea792804d8623f56

097aabdb

[automerger skipped] DO NOT MERGE: Do not inject mock location to chipset am:... · e8295597

Yu-Han Yang authored 4 years ago

[automerger skipped] DO NOT MERGE: Do not inject mock location to chipset am: c59cbd13 am: 77fa00f3 -s ours am: 691ae777 am: 3e7e3026 am: 557954f5 -s ours

am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7b7669b701641bb79964a13037289348b9c9489d

e8295597

[automerger skipped] Merge "Update TelephonyDisplayInfo docs" am: ... · 60ddcd20

Sarah Chin authored 4 years ago

[automerger skipped] Merge "Update TelephonyDisplayInfo docs" am: a906fd5e am: 90b6c9de am: 871566af -s ours

am skip reason: Change-Id Ia59efcf68c77d79be1a223f9fd6cbf3ec333478a with SHA-1 b4be4c8b is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3840d17e28b911856f05f093a6e91e8cca2cc674

60ddcd20

Merge "Check slot in reboot function" am: am: · 3720d381

Tianjie Xu authored 4 years ago

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8185a0947f715091f3190a016d5ed126dbb49fff

3720d381

[automerger skipped] DO NOT MERGE: Do not inject mock location to chipset am:... · 557954f5

Yu-Han Yang authored 4 years ago

[automerger skipped] DO NOT MERGE: Do not inject mock location to chipset am: c59cbd13 am: 77fa00f3 -s ours am: 691ae777 am: 3e7e3026

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia4faf0e64d3fd57823b6472ee52ca3b8fa2946c1

557954f5

[automerger skipped] DO NOT MERGE: Do not inject mock location to chipset am:... · c21c9840

Yu-Han Yang authored 4 years ago

[automerger skipped] DO NOT MERGE: Do not inject mock location to chipset am: c59cbd13 am: 77fa00f3 -s ours am: 691ae777 am: a74aab77 -s ours

am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I90002657f1c7cab23dc91717d5afd9f469583a3b

c21c9840

Merge "Do not hard code camera/mic icons to enabled, but default to enabled" · 0aa69a62
Nate Myren authored 4 years ago

0aa69a62

[automerger skipped] DO NOT MERGE: Do not inject mock location to chipset am:... · a74aab77

Yu-Han Yang authored 4 years ago

[automerger skipped] DO NOT MERGE: Do not inject mock location to chipset am: c59cbd13 am: 77fa00f3 -s ours am: 691ae777

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I21e8188ec6d70c88e1997f78f997bbfb653d92cd

a74aab77

Merge "Update TelephonyDisplayInfo docs" am: am: · 871566af

Sarah Chin authored 4 years ago

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie9e12f5e374fd29601182e8b99250a91933a2556

871566af

[automerger skipped] DO NOT MERGE: Do not inject mock location to chipset am:... · 3e7e3026

Yu-Han Yang authored 4 years ago

[automerger skipped] DO NOT MERGE: Do not inject mock location to chipset am: c59cbd13 am: 77fa00f3 -s ours am: 691ae777

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I204a77fcaa890c1bbf86f6eef05f875b7a114831

3e7e3026

Merge "Check slot in reboot function" am: · 4635bad1

Tianjie Xu authored 4 years ago

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I89c908bb931c25521b9c7bd8faf4d57c31882143

4635bad1

[automerger skipped] DO NOT MERGE: Do not inject mock location to chipset am:... · 579e5e37

Yu-Han Yang authored 4 years ago

[automerger skipped] DO NOT MERGE: Do not inject mock location to chipset am: e8212659 am: 9c2a7887 am: faec4dfe -s ours

am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9dfaa07e8f50b941dab620539391d1c55b4cab90

579e5e37

Merge "Merge "freezer: increase timeout to 5 mins" into rvc-qpr-dev am:... · c7f5e2f7

Automerger Merge Worker authored 4 years ago

Merge "Merge "freezer: increase timeout to 5 mins" into rvc-qpr-dev am: 821bc375" into rvc-qpr-dev-plus-aosp am: 935f1287

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8e1ccb378cb8293b55bd2dc32ea49934a12ac297

c7f5e2f7

Merge "Update AppWidget owners" am: am: am: · 1ae7f404

Jeff Sharkey authored 4 years ago

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I051e300cf34545ce632f64ef1dc7711f97c84599

1ae7f404

Merge "Correct OMAPI OWNERS" am: am: am: · ad8dbc5d

Alisher Alikhodjaev authored 4 years ago

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic1c495be9a5825a502b83f53d35c677d406ef70b

ad8dbc5d

Merge changes from topic "am-9f1f3a1f2cf946f0b2fe74dbf8e9b4d1" into... · 9a5d6145

Automerger Merge Worker authored 4 years ago

Merge changes from topic "am-9f1f3a1f2cf946f0b2fe74dbf8e9b4d1" into rvc-qpr-dev-plus-aosp am: b8349d34

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I52809a50094c12e3f6fd8b0e5b17b09cddf04273

9a5d6145

[automerger skipped] Merge "DO NOT MERGE: Do not inject mock location to... · 4c84ba25

TreeHugger Robot authored 4 years ago

[automerger skipped] Merge "DO NOT MERGE: Do not inject mock location to chipset" into rvc-qpr-dev am: 94b4830c am: 7a606738 -s ours

am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib060b5bf5ea1653dba84ca0a010465ef087f6b12

4c84ba25

Merge "Add base states with exception catching and utility functions" am:... · ea0eddd4

Benedict Wong authored 4 years ago

Merge "Add base states with exception catching and utility functions" am: 4d061143 am: c048e789 am: f8e1ebb6

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5375dd28f5f89807b8b1ea64a1253ac85a2c1863

ea0eddd4

Merge "[MTE] Add SYNC compat feature & disable for system apps." am:... · 75ab8ce3

Mitch Phillips authored 4 years ago

Merge "[MTE] Add SYNC compat feature & disable for system apps." am: 284195e7 am: 6d521a4b am: 493aea74

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I26428109fd75ab0ea2bf6091970949e3daa11d84

75ab8ce3

[automerger skipped] DO NOT MERGE: Do not inject mock location to chipset am:... · 8a65eef5

Yu-Han Yang authored 4 years ago

[automerger skipped] DO NOT MERGE: Do not inject mock location to chipset am: e8212659 am: abb3d56c -s ours

am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8b273d441c52022077f37d9a617b50eb3a9f9d2d

8a65eef5

[automerger skipped] DO NOT MERGE: Do not inject mock location to chipset am:... · 691ae777

Yu-Han Yang authored 4 years ago

[automerger skipped] DO NOT MERGE: Do not inject mock location to chipset am: c59cbd13 am: 77fa00f3 -s ours

am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie57557ba29ac8a8ca7827ed039817b6c75c1b0d6

691ae777

Merge "Check slot in reboot function" · 70127316
Tianjie Xu authored 4 years ago

70127316

Merge "Update TelephonyDisplayInfo docs" am: · 90b6c9de

Sarah Chin authored 4 years ago

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iaa3747cf505974fa1faea05589b981fd687d0109

90b6c9de

DO NOT MERGE: Do not inject mock location to chipset am: am: · faec4dfe

Yu-Han Yang authored 4 years ago

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6e6828c71c216c14e95dc7ab921ec84c70779d36

faec4dfe

Merge "Merge "freezer: increase timeout to 5 mins" into rvc-qpr-dev am:... · 935f1287
Automerger Merge Worker authored 4 years ago
```
Merge "Merge "freezer: increase timeout to 5 mins" into rvc-qpr-dev am: 821bc375" into rvc-qpr-dev-plus-aosp
```
935f1287

Merge "Update AppWidget owners" am: am: · 0cfbc863

Jeff Sharkey authored 4 years ago

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I742b341c6d3c6a5ca7912c59e0c5cebfb279791f

0cfbc863

Merge "freezer: increase timeout to 5 mins" into rvc-qpr-dev am: · aa838b8c

Marco Ballesio authored 4 years ago

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1fdd76e3579e47ea62ef133e3934fd7277883a6f

aa838b8c

Merge "Correct OMAPI OWNERS" am: am: · e11bf049

Alisher Alikhodjaev authored 4 years ago

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ide1c94afe872365d69f34bd62200e6990b10c585

e11bf049

Merge changes from topic "am-9f1f3a1f2cf946f0b2fe74dbf8e9b4d1" into rvc-qpr-dev-plus-aosp · b8349d34

Automerger Merge Worker authored 4 years ago

* changes:
  Merge "DO NOT MERGE: Do not inject mock location to chipset" into rvc-qpr-dev am: 94b4830c
  DO NOT MERGE: Do not inject mock location to chipset am: abccd8f7

b8349d34

Merge "DO NOT MERGE: Do not inject mock location to chipset" into rvc-qpr-dev am: · 7a606738

TreeHugger Robot authored 4 years ago

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ibf337d347c30f5b34bac2fe86fd55a142d2a3647

7a606738

Merge "Add base states with exception catching and utility functions" am: am: · f8e1ebb6

Benedict Wong authored 4 years ago

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I36687edcbbe2cd6165e02b924372c0d666daacfb

f8e1ebb6

Merge "[MTE] Add SYNC compat feature & disable for system apps." am: am: · 493aea74

Mitch Phillips authored 4 years ago

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ibba6138e7e5d0dcfdb6fdd3fab9d9cb8ee8f8b0a

493aea74

DO NOT MERGE: Do not inject mock location to chipset am: · d0fb2a7a

Yu-Han Yang authored 4 years ago

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1472c4aa1300628e60a4012bb7579018ea37609f

d0fb2a7a

DO NOT MERGE: Do not inject mock location to chipset am: · abb3d56c

Yu-Han Yang authored 4 years ago

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I46b2627101dc0de2637f82d8607ace8f110600e1

abb3d56c

DO NOT MERGE: Do not inject mock location to chipset am: · 77fa00f3

Yu-Han Yang authored 4 years ago

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia56381d103931a932e1a3e08d6baa949d2ee864f

77fa00f3

DO NOT MERGE: Do not inject mock location to chipset am: · 9c2a7887

Yu-Han Yang authored 4 years ago

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0bb77c57675a0e96e90b6ec86a33f804fc695e75

9c2a7887

Merge "freezer: increase timeout to 5 mins" into rvc-qpr-dev · 821bc375
Marco Ballesio authored 4 years ago

821bc375
Merge "Update TelephonyDisplayInfo docs" · a906fd5e
Sarah Chin authored 4 years ago

a906fd5e
Merge "AudioService: correct BT A2DP abs volume curve for low levels" · 5bc618b5
Jean-Michel Trivi authored 4 years ago

5bc618b5
Merge "[ImpressionAttestation] Updated Impression Attestation APIs" · c2225b45
Chavi Weingarten authored 4 years ago

c2225b45