Commits · 0c0ed6f1c1cf074c1eb451a8ca1a7a26b9f2674e · Dhina17 / platform_frameworks_base

Apr 04, 2022

Merge "Provide gesture and tappable element insets for caption" am: am: · 0c0ed6f1

Yunfan Chen authored 3 years ago

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

Change-Id: I72029e1a0de4026cfbf17604591433683e13b2d4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

0c0ed6f1

Merge "Provide gesture and tappable element insets for caption" am: · 3cd3a859

Yunfan Chen authored 3 years ago

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

Change-Id: I1e6bf195c6783ba547915653fb3451598cfeb972
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

3cd3a859

Merge "Provide gesture and tappable element insets for caption" · 268eff33
Yunfan Chen authored 3 years ago

268eff33

Apr 03, 2022

Merge changes from topic "merge_8391262" into stage-aosp-master am: · 4624b528

Xin Li authored 3 years ago

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

Change-Id: I5c9d2124fff45b80d4c0c701f589b7fbd685ac59
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

4624b528

[automerger skipped] Merge Android 12 QPR3 ab/8391262 am: -s ours · 2a747fd0

Xin Li authored 3 years ago

am skip reason: Merged-In Id7458a889e8b084a260b18f56db315ee1317b3a6 with SHA-1 789701fb is already in history

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

Change-Id: I7cd17f0442bec0ea54aacfdf8bceac655ce39a8d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

2a747fd0

Merge changes from topic "merge_8391262" into stage-aosp-master · be28e531
Xin Li authored 3 years ago
```
* changes:
  Fixup OWNERS file merge conflicts.
  Merge Android 12 QPR3 ab/8391262
```
be28e531

Apr 02, 2022

Merge "[SettingsProvider] update API javadoc" am: am: · 8f9b80e5

Songchun Fan authored 3 years ago

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

Change-Id: Ieb0676111a1dddf6a1126ecb2ef19ef1520188bb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

8f9b80e5

Apr 01, 2022

Merge "[SettingsProvider] update API javadoc" am: · 9338b2de

Songchun Fan authored 3 years ago

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

Change-Id: I54001b5f330d4569fc5b9dc1db09bf409fa70017
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

9338b2de

Merge "Trigger revalidation of VCN, underlying networks" am: am: · 3e2628d0

Benedict Wong authored 3 years ago

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

Change-Id: I23ccd7dcf2eb98c91ed8ffab8f6b41cc3ffaef85
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

3e2628d0

Merge "[SettingsProvider] update API javadoc" · ebcfe1c6
Songchun Fan authored 3 years ago

ebcfe1c6

Merge "Trigger revalidation of VCN, underlying networks" am: · 4755021e

Benedict Wong authored 3 years ago

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

Change-Id: I69531948b404deac5ffdeb2687f77a324da28fec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

4755021e

Merge "Add context to error message." am: am: · e210ca9e

Treehugger Robot authored 3 years ago

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

Change-Id: I386d9460938f2045d41b0c6c19902d0a16fdca4d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

e210ca9e

Merge "setProperty check for byte limit" am: am: · 39709e6b

Ling Ma authored 3 years ago

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

Change-Id: I1ea10c7f473956cdeeed14fbe8fa455bf4bb088d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

39709e6b

Merge changes from topic "truncate operator name" am: am: · eb897b1d

Ling Ma authored 3 years ago

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

Change-Id: Ic3985aab30f06ce02ec01e43ce8a6c05abd419a2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

eb897b1d

Merge "Trigger revalidation of VCN, underlying networks" · bd14581e
Benedict Wong authored 3 years ago

bd14581e

Merge "Add context to error message." am: · 82e2afb2

Treehugger Robot authored 3 years ago

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

Change-Id: I310956878bc02bbf5c0641b6cdc728212ea17946
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

82e2afb2

Merge "Add context to error message." · 07547144
Treehugger Robot authored 3 years ago

07547144

Merge "setProperty check for byte limit" am: · 4cd99146

Ling Ma authored 3 years ago

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

Change-Id: Ia43944b29bc5da26590057e67aaa99b3bd4b7819
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

4cd99146

Merge changes from topic "truncate operator name" am: · 9cf73e36

Ling Ma authored 3 years ago

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

Change-Id: I53d217c4e57a62fc7a4039af16e7e780af5c87f2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

9cf73e36

Merge "setProperty check for byte limit" · 18b48023
Ling Ma authored 3 years ago

18b48023

Merge changes from topic "truncate operator name" · ffa0f982

Ling Ma authored 3 years ago

* changes:
  Truncate operator name to fit into SystemProp size
  Add truncateStringForUtf8Storage()

ffa0f982

[SettingsProvider] update API javadoc · ed6aebc4

Songchun Fan authored 3 years ago

Address comments from API review

BUG: 227781337
Test: N/A
Change-Id: I3042be0671728d06bf1c7ae09baee538bb82fbe7
Merged-In: I3042be0671728d06bf1c7ae09baee538bb82fbe7

ed6aebc4

Merge "Added command line tool to enable/disable new data stack" am: am: · e414bdfa

Treehugger Robot authored 3 years ago

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

Change-Id: Icb2dca6d713737eef8cc4a5eb9e235bde71fb774
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

e414bdfa

Fixup OWNERS file merge conflicts. · 4b911827
Xin Li authored 3 years ago
```
Change-Id: I8948b1361211825cc45f049f6484dc290620801b
```
4b911827

Merge "Added command line tool to enable/disable new data stack" am: · 0aeb6102

Treehugger Robot authored 3 years ago

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

Change-Id: Ie064d0ab40340e4b862a12a73aee4b257b1eaf50
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

0aeb6102

Merge "Added command line tool to enable/disable new data stack" · bdf20659
Treehugger Robot authored 3 years ago

bdf20659

Merge Android 12 QPR3 ab/8391262 · 0bb254bd

Xin Li authored 3 years ago

Bug: 226662282
Merged-In: Id7458a889e8b084a260b18f56db315ee1317b3a6
Change-Id: I4819065c2c2adb24d08fb1e32eefd6f335a1ec48

0bb254bd

Merge "Add PROTOCOL_UNKOWN" am: am: · 228f933f

Sarah Chin authored 3 years ago

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

Change-Id: Ie17d28198fe3b0dd2edf88986550e3cd183f7986
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

228f933f

Merge "Add PROTOCOL_UNKOWN" am: · 235c3b63

Sarah Chin authored 3 years ago

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

Change-Id: Id55ff9221c025a93ce0e0a73753c82d65a646320
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

235c3b63

Merge "Remove FDE warning from AccessibilityShortcutChooserActivity" am: am: · cd425934

Eric Biggers authored 3 years ago

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

Change-Id: I3fbe51313843c63950cb0e3d8141b88f79d41d77
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

cd425934

Merge "Add PROTOCOL_UNKOWN" · e5e9a5c3
Sarah Chin authored 3 years ago

e5e9a5c3

Merge "Remove FDE warning from AccessibilityShortcutChooserActivity" am: · b548de78

Eric Biggers authored 3 years ago

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

Change-Id: I4bc898e73ec0a23b60f3cf365302690f63da5c46
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

b548de78

Merge "Remove FDE warning from AccessibilityShortcutChooserActivity" · db9ea171
Eric Biggers authored 3 years ago

db9ea171

Added command line tool to enable/disable new data stack · b6512b4e

Jack Yu authored 3 years ago

Provide the temporary command line tool to check whether new
data stack is enabled or not.

Bug: 196597630
Test: adb shell cmd phone get-data-mode
Change-Id: I9f95e7424e6e74af12a0f6780a58fb5732df7300
Merged-In: I9f95e7424e6e74af12a0f6780a58fb5732df7300

b6512b4e

Add PROTOCOL_UNKOWN · d985d0a3

Ling Ma authored 3 years ago

Test: build
Bug: 217375910
Merged-In: I5bd0351925d27bb2178d4cd0cc93197f463236cd
Change-Id: I5bd0351925d27bb2178d4cd0cc93197f463236cd

d985d0a3

Merge "Prevent exfiltration of system files via user image settings." into... · e35d1122

TreeHugger Robot authored 3 years ago

Merge "Prevent exfiltration of system files via user image settings." into sc-dev am: be7735ef am: 5b62c515 am: 8c10a6aa

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

Change-Id: I100fd497b19a8cad113c7d9320c1e64212502896
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

e35d1122

Add context to error message. · 93aa95f7

Bob Badour authored 3 years ago

Would have been very useful to avoid http://b/227682097

Bug: 227682097

Test: m apexer apexer_test deapexer debugfs_static; atest --host apexer_test
Change-Id: I24234d053a06868493831d40f94f7e46956391a1

93aa95f7

Merge "Prevent exfiltration of system files via user image settings." into... · 8c10a6aa

TreeHugger Robot authored 3 years ago

Merge "Prevent exfiltration of system files via user image settings." into sc-dev am: be7735ef am: 5b62c515

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

Change-Id: I892a79e6b627eb1e8e58007613a5855b7e74250a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

8c10a6aa

Merge "Prevent exfiltration of system files via user image settings." into sc-dev am: · 5b62c515

TreeHugger Robot authored 3 years ago

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

Change-Id: Ib7bf62ea0ad68e3a104d426f7f1d912597cc471e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

5b62c515

Merge "Prevent exfiltration of system files via user image settings." into sc-dev · be7735ef
TreeHugger Robot authored 3 years ago

be7735ef