drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
691,285 Commits 1 Branch 0 Tags
Commit Graph

691285 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jack Yu
0d9d376b45 Merge "Updated the owners" am: c22f798040 am: d7659e6014 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2052239

Change-Id: I8b1d65513e60f7d12176bc08677f2e072c2cc9d8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-04 05:53:45 +00:00
Jack Yu
d7659e6014 Merge "Updated the owners" am: c22f798040 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2052239

Change-Id: Icf59b227d3b37ba84874d9452b16762b47603649
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-04 05:40:33 +00:00
Jack Yu
c22f798040 Merge "Updated the owners" 2022-04-04 05:22:30 +00:00
Yunfan Chen
0c0ed6f1c1 Merge "Provide gesture and tappable element insets for caption" am: 268eff33ec am: 3cd3a85988 
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>
 2022-04-04 03:45:19 +00:00
Yunfan Chen
3cd3a85988 Merge "Provide gesture and tappable element insets for caption" am: 268eff33ec 
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>
 2022-04-04 03:30:58 +00:00
Yunfan Chen
268eff33ec Merge "Provide gesture and tappable element insets for caption" 2022-04-04 03:15:01 +00:00
Xin Li
4624b52801 Merge changes from topic "merge_8391262" into stage-aosp-master am: be28e53132 
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>
 2022-04-03 07:14:20 +00:00
Xin Li
2a747fd030 [automerger skipped] Merge Android 12 QPR3 ab/8391262 am: 0bb254bd3f -s ours 
am skip reason: Merged-In Id7458a889e8b084a260b18f56db315ee1317b3a6 with SHA-1 789701fb45 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>
 2022-04-03 07:11:57 +00:00
Xin Li
be28e53132 Merge changes from topic "merge_8391262" into stage-aosp-master 
* changes:
  Fixup OWNERS file merge conflicts.
  Merge Android 12 QPR3 ab/8391262
 2022-04-03 06:41:20 +00:00
Songchun Fan
8f9b80e5f2 Merge "[SettingsProvider] update API javadoc" am: ebcfe1c6e0 am: 9338b2de56 
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>
 2022-04-02 00:10:54 +00:00
Songchun Fan
9338b2de56 Merge "[SettingsProvider] update API javadoc" am: ebcfe1c6e0 
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>
 2022-04-01 23:49:23 +00:00
Benedict Wong
3e2628d028 Merge "Trigger revalidation of VCN, underlying networks" am: bd14581e6b am: 4755021eb1 
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>
 2022-04-01 23:25:31 +00:00
Songchun Fan
ebcfe1c6e0 Merge "[SettingsProvider] update API javadoc" 2022-04-01 23:25:15 +00:00
Benedict Wong
4755021eb1 Merge "Trigger revalidation of VCN, underlying networks" am: bd14581e6b 
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>
 2022-04-01 22:55:42 +00:00
Treehugger Robot
e210ca9e34 Merge "Add context to error message." am: 0754714469 am: 82e2afb277 
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>
 2022-04-01 22:37:15 +00:00
Ling Ma
39709e6beb Merge "setProperty check for byte limit" am: 18b4802337 am: 4cd991467f 
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>
 2022-04-01 22:36:40 +00:00
Ling Ma
eb897b1d85 Merge changes from topic "truncate operator name" am: ffa0f982b6 am: 9cf73e369d 
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>
 2022-04-01 22:36:38 +00:00
Benedict Wong
bd14581e6b Merge "Trigger revalidation of VCN, underlying networks" 2022-04-01 22:33:00 +00:00
Treehugger Robot
82e2afb277 Merge "Add context to error message." am: 0754714469 
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>
 2022-04-01 22:19:55 +00:00
Treehugger Robot
0754714469 Merge "Add context to error message." 2022-04-01 22:14:12 +00:00
Ling Ma
4cd991467f Merge "setProperty check for byte limit" am: 18b4802337 
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>
 2022-04-01 22:14:02 +00:00
Ling Ma
9cf73e369d Merge changes from topic "truncate operator name" am: ffa0f982b6 
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>
 2022-04-01 22:13:59 +00:00
Ling Ma
18b4802337 Merge "setProperty check for byte limit" 2022-04-01 21:43:23 +00:00
Ling Ma
ffa0f982b6 Merge changes from topic "truncate operator name" 
* changes:
  Truncate operator name to fit into SystemProp size
  Add truncateStringForUtf8Storage()
 2022-04-01 21:43:23 +00:00
Songchun Fan
ed6aebc4fc [SettingsProvider] update API javadoc 
Address comments from API review

BUG: 227781337
Test: N/A
Change-Id: I3042be0671728d06bf1c7ae09baee538bb82fbe7
Merged-In: I3042be0671728d06bf1c7ae09baee538bb82fbe7
 2022-04-01 21:29:24 +00:00
Treehugger Robot
e414bdfad2 Merge "Added command line tool to enable/disable new data stack" am: bdf20659d3 am: 0aeb6102ce 
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>
 2022-04-01 21:15:07 +00:00
Xin Li
4b9118275b Fixup OWNERS file merge conflicts. 
Change-Id: I8948b1361211825cc45f049f6484dc290620801b
 2022-04-01 21:00:58 +00:00
Treehugger Robot
0aeb6102ce Merge "Added command line tool to enable/disable new data stack" am: bdf20659d3 
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>
 2022-04-01 20:56:31 +00:00
Treehugger Robot
bdf20659d3 Merge "Added command line tool to enable/disable new data stack" 2022-04-01 20:40:00 +00:00
Xin Li
0bb254bd3f Merge Android 12 QPR3 ab/8391262 
Bug: 226662282
Merged-In: Id7458a889e8b084a260b18f56db315ee1317b3a6
Change-Id: I4819065c2c2adb24d08fb1e32eefd6f335a1ec48
 2022-04-01 20:32:30 +00:00
Sarah Chin
228f933f63 Merge "Add PROTOCOL_UNKOWN" am: e5e9a5c339 am: 235c3b6316 
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>
 2022-04-01 19:13:22 +00:00
Sarah Chin
235c3b6316 Merge "Add PROTOCOL_UNKOWN" am: e5e9a5c339 
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>
 2022-04-01 18:57:39 +00:00
Eric Biggers
cd42593479 Merge "Remove FDE warning from AccessibilityShortcutChooserActivity" am: db9ea17177 am: b548de7856 
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>
 2022-04-01 18:42:11 +00:00
Sarah Chin
e5e9a5c339 Merge "Add PROTOCOL_UNKOWN" 2022-04-01 18:32:50 +00:00
Eric Biggers
b548de7856 Merge "Remove FDE warning from AccessibilityShortcutChooserActivity" am: db9ea17177 
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>
 2022-04-01 18:26:05 +00:00
Eric Biggers
db9ea17177 Merge "Remove FDE warning from AccessibilityShortcutChooserActivity" 2022-04-01 18:00:45 +00:00
Jack Yu
b6512b4ead Added command line tool to enable/disable new data stack 
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
 2022-04-01 10:55:48 -07:00
Jack Yu
7750d9fa9f Updated the owners 
Updated the owners to the latest telephony and
telecomm team members.

Test: Build
Bug: None
Change-Id: I3a456b168ec24199413e42c5fa615ecf285af79b
 2022-04-01 16:46:46 +00:00
Ling Ma
d985d0a3fe Add PROTOCOL_UNKOWN 
Test: build
Bug: 217375910
Merged-In: I5bd0351925d27bb2178d4cd0cc93197f463236cd
Change-Id: I5bd0351925d27bb2178d4cd0cc93197f463236cd
 2022-04-01 09:40:49 -07:00
TreeHugger Robot
e35d11225a Merge "Prevent exfiltration of system files via user image settings." into sc-dev am: be7735efcb am: 5b62c51502 am: 8c10a6aa0d 
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>
 2022-04-01 15:25:20 +00:00
Bob Badour
93aa95f71a Add context to error message. 
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
 2022-04-01 15:21:26 +00:00
TreeHugger Robot
8c10a6aa0d Merge "Prevent exfiltration of system files via user image settings." into sc-dev am: be7735efcb am: 5b62c51502 
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>
 2022-04-01 15:06:37 +00:00
TreeHugger Robot
5b62c51502 Merge "Prevent exfiltration of system files via user image settings." into sc-dev am: be7735efcb 
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>
 2022-04-01 14:46:51 +00:00
TreeHugger Robot
be7735efcb Merge "Prevent exfiltration of system files via user image settings." into sc-dev 2022-04-01 14:29:48 +00:00
mrenouf
e50de70f41 Merge "Fix edit button in screenshot share activity" am: d7013fb94e am: c6158cc84d 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1991974

Change-Id: I2e4e50e79a97eaea2871cc6a743417c4b4aab588
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-01 12:50:50 +00:00
mrenouf
c6158cc84d Merge "Fix edit button in screenshot share activity" am: d7013fb94e 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1991974

Change-Id: Idd11a3a897401e8a965a211cd46a5e6a731d7f5d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-01 12:28:55 +00:00
mrenouf
d7013fb94e Merge "Fix edit button in screenshot share activity" 2022-04-01 12:10:01 +00:00
Yi-yo Chiang
8c48dc11cf Merge "DSU service: Log insufficient storage space error" am: 9b420e664a am: 1e43855f6c 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2049806

Change-Id: I7b12a1c5d2dfb833c5330c44a35b110fc18c1859
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-01 08:29:33 +00:00
Yi-yo Chiang
1e43855f6c Merge "DSU service: Log insufficient storage space error" am: 9b420e664a 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2049806

Change-Id: I929141ce4840a879b62664c917904aa541b3f635
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-01 08:15:47 +00:00
Yi-yo Chiang
9b420e664a Merge "DSU service: Log insufficient storage space error" 2022-04-01 07:53:59 +00:00