Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
567,036 Commits 3 Branches 0 Tags
5c174ce1519280deee6fcf78cbae9541ed85c016
Commit Graph

567036 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Benedict Wong
5c174ce151 Merge "Remove unused variable in MtuUtils" am: ea4537c920 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1673535

Change-Id: If4a2c5ea6d7c31f1f5c88d7d9eb2e782ee69bb0c
 2021-04-13 21:53:50 +00:00
Benedict Wong
ea4537c920 Merge "Remove unused variable in MtuUtils" 2021-04-13 21:10:31 +00:00
TreeHugger Robot
e841b21a2d Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master 2021-04-13 19:42:21 +00:00
TreeHugger Robot
4392ab06ca Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master 2021-04-13 19:25:34 +00:00
Jordan Liu
79bd307a60 Merge "Override the label of the SIM Toolkit application dynamically" am: 98833ee208 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1663960

Change-Id: Ib5f376240ca9f1128e2edebcd7b5a9cf9319c7e6
 2021-04-13 18:45:53 +00:00
Jordan Liu
98833ee208 Merge "Override the label of the SIM Toolkit application dynamically" 2021-04-13 18:30:19 +00:00
Automerger Merge Worker
23c55673c6 Merge "Merge "Update references incompatibilies files" am: 1ea3057847" into stage-aosp-master 2021-04-13 18:26:41 +00:00
TreeHugger Robot
b4f8703b7d Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master 2021-04-13 18:24:24 +00:00
Anton Hansson
eaa90d0156 Merge "Update references incompatibilies files" am: 1ea3057847 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1671839

Change-Id: I40a062d82dc00c3489700b0a43cd935679c3fda7
 2021-04-13 18:15:29 +00:00
Anton Hansson
1ea3057847 Merge "Update references incompatibilies files" 2021-04-13 18:03:59 +00:00
Yan Yan
b9b0d644a7 Merge "Use IkeProtocolException#getErrorType() to identify a specific error" am: 7a50e7f206 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1672427

Change-Id: I17956c626e473c6a86994e4f9a8f5f477487d9e3
 2021-04-13 18:03:07 +00:00
TreeHugger Robot
c0d744e6a1 Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master 2021-04-13 17:51:56 +00:00
TreeHugger Robot
9ca5de2464 Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master 2021-04-13 17:44:11 +00:00
Bill Yi
d69e8250ce Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I80e06d53ebd4dceb6742c609879b6c8c776e1b0f
 2021-04-13 10:42:09 -07:00
Yan Yan
7a50e7f206 Merge "Use IkeProtocolException#getErrorType() to identify a specific error" 2021-04-13 17:21:46 +00:00
Bill Yi
39269387de Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: If6dff372bab8fae1f2b278388d8a87ff2b1db07c
 2021-04-13 10:13:14 -07:00
TreeHugger Robot
60dde1dd13 Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master 2021-04-13 16:37:24 +00:00
TreeHugger Robot
79b99b4cc7 Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master 2021-04-13 16:22:53 +00:00
TreeHugger Robot
0f57ff1fe7 Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master 2021-04-13 16:09:23 +00:00
TreeHugger Robot
c55482fcde Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master 2021-04-13 15:57:17 +00:00
Treehugger Robot
0087b62300 Merge "OOB: Implement getLocalOutOfBand API" am: c1349d4c56 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1662621

Change-Id: Ia0e052f0fcc8c7f17e5f099e9bad2cc596887de7
 2021-04-13 15:44:37 +00:00
Treehugger Robot
c1349d4c56 Merge "OOB: Implement getLocalOutOfBand API" 2021-04-13 15:28:25 +00:00
Anton Hansson
24eb9ef668 Merge "Remove disabling of errorprone checks for stubs" am: 34fb03a88f 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1671725

Change-Id: I28021969d9d234424a400b97b0d644bed092611b
 2021-04-13 15:18:27 +00:00
Bill Yi
7df3eeac31 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I396db98272ce306cd4220d0fbc73197d85a78745
 2021-04-13 08:02:30 -07:00
Anton Hansson
34fb03a88f Merge "Remove disabling of errorprone checks for stubs" 2021-04-13 15:00:29 +00:00
Treehugger Robot
e0351bf49f Merge "CEC: Implement handleReportArcTermination method" am: 9026f587b7 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1589692

Change-Id: I1fcd93a1f411dada4d9fd3b552cb97a314e3342b
 2021-04-13 14:57:42 +00:00
Treehugger Robot
9026f587b7 Merge "CEC: Implement handleReportArcTermination method" 2021-04-13 14:24:27 +00:00
Anton Hansson
7f06596361 Merge changes I5719ba0f,I5f3106b7,I3fd90c2d am: fd7056c7c9 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1673390

Change-Id: I7fa6f421b3ec88af5711ef9c46a0dbd08ff29652
 2021-04-13 14:04:48 +00:00
Anton Hansson
7e27fd99aa Move font tool build rules to subdir am: 702aa95096 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1673389

Change-Id: Idbf084313f8abcae9caaad94db798c501b1d8f4a
 2021-04-13 14:01:35 +00:00
Anton Hansson
5ed18f82f3 Move build modules from top-level to core/java/ am: 84918d5674 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1673386

Change-Id: I401ed248f28f593e46689a66574c4e50f1ce18b2
 2021-04-13 13:59:06 +00:00
Bill Yi
c28f1ec47b Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ia8ec860e1859873bbca3b9248f079d942b22fece
 2021-04-13 06:56:36 -07:00
Jeff Sharkey
6bc88ceb5d Merge "uwb: Add owners for uwb service" am: 15ee3b3c0e 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1673236

Change-Id: I79233c4e5cc6b6e78143eb264460b4e5121b95e0
 2021-04-13 13:46:57 +00:00
Aravind Angadi
7fba133318 CEC: Implement handleReportArcTermination method 
Bug: 159901363
Test: None

Change-Id: I0d22678f09219e47aa93af13992c3050b32334a8
Merged-In: I0d22678f09219e47aa93af13992c3050b32334a8
 2021-04-13 13:14:10 +00:00
Anton Hansson
fd7056c7c9 Merge changes I5719ba0f,I5f3106b7,I3fd90c2d 
* changes:
  Move framework proto build rules to separate file
  Move font tool build rules to subdir
  Move build modules from top-level to core/java/
 2021-04-13 12:57:12 +00:00
Jeff Sharkey
15ee3b3c0e Merge "uwb: Add owners for uwb service" 2021-04-13 12:56:41 +00:00
Bill Yi
79ce43c3e1 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I6f85c20ab47119d1f6fb8d5e7eff28467760c8d1
 2021-04-13 05:51:02 -07:00
Paul Duffin
26efc48ba8 Merge "Export monolithic hidden api files to the dist" am: f94ff5a36e 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1673385

Change-Id: Ifeabdabd6b6b75ee7da1f067b2db1b66b15bfdf7
 2021-04-13 11:55:07 +00:00
Bill Yi
8f2025d9b9 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I0adf77eaf7bab1dc98cb677a22a5baf75816e01c
 2021-04-13 04:12:34 -07:00
Paul Duffin
f94ff5a36e Merge "Export monolithic hidden api files to the dist" 2021-04-13 09:57:12 +00:00
Bill Yi
67149b8c73 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I361f2c7637e6de28b41631dd2d608d6e3aeaa8f9
 2021-04-13 02:34:51 -07:00
Chiachang Wang
6b7167e807 Merge "Make getUid a method on UserHandle itself instead of static" am: bd1cc4f2a2 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1669185

Change-Id: If47dccc346aa78c7cb49aafbd5e07d35d3403c6a
 2021-04-13 08:51:12 +00:00
Bill Yi
16f9abf39f Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I08af91c358e06bde1cd8c528d5f6665cf5210d7e
 2021-04-13 01:29:38 -07:00
Chiachang Wang
bd1cc4f2a2 Merge "Make getUid a method on UserHandle itself instead of static" 2021-04-13 08:15:47 +00:00
Chiachang Wang
a8ae705499 Merge "Add SDK version check to skip S added API test" am: 739195c5b0 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1673167

Change-Id: I40516d56f9ca477d62c362dbdf11aad713c620ae
 2021-04-13 05:17:53 +00:00
Bill Yi
27a78d173e Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I28d2bc9e8e11f740acb803399f8213baefcba3cd
 2021-04-12 21:41:47 -07:00
Chiachang Wang
739195c5b0 Merge "Add SDK version check to skip S added API test" 2021-04-13 04:30:36 +00:00
Roshan Pius
c773d42a04 uwb: Add owners for uwb service 
The code changes are in internal branch in topic:
https://googleplex-android-review.git.corp.google.com/q/topic:uwb_aosp_service

Only pulling in the OWNERS changes to AOSP.

Bug: 183904955
Test: N/A
Change-Id: I035e908e32090415c6f0e9071084c360abf5aee7
 2021-04-12 21:22:51 -07:00
Amy Zhang
012a4243cd Merge "Allow Descrambler.add/removePid to pass a nullable optional filter" am: 0b8ff8e00e 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1672265

Change-Id: Ifdbe40af2a6e8e6b70ad9689a819e4c5b793a978
 2021-04-13 03:17:31 +00:00
Wonsik Kim
69814e45a1 Merge "MediaCodec: minor revision of APIs for vendor parameters" am: 5d41bf1b65 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1673760

Change-Id: I4e6a062210c5e08ca207d26c5c39667c2f26a1d8
 2021-04-13 03:02:43 +00:00
Amy Zhang
0b8ff8e00e Merge "Allow Descrambler.add/removePid to pass a nullable optional filter" 2021-04-13 02:59:06 +00:00