Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
569,408 Commits 3 Branches 0 Tags
214718fbec173ea7582ca44541ec09866a5ab0dd
Commit Graph

569408 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
214718fbec [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: b4f8703b7d -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ibd900bcd612dfc92643602502387b0ea549c6bbd
 2021-04-13 18:26:08 +00:00
Yan Yan
735d9fe220 Merge "Use IkeProtocolException#getErrorType() to identify a specific error" am: 7a50e7f206 am: b9b0d644a7 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1672427

Change-Id: I0f4c7848fcc1ed5edc3da1b0712d60c7a8bcc57f
 2021-04-13 18:26:01 +00:00
TreeHugger Robot
8ec76482fa [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: c0d744e6a1 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I0308e8d2e22a840a06b3a9a36c629d9a682049e8
 2021-04-13 18:25:29 +00:00
TreeHugger Robot
fa811843fe [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 9ca5de2464 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iab1bbd09e0c24030e6e396366a81537814afcee8
 2021-04-13 18:24:34 +00:00
TreeHugger Robot
b4f8703b7d Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master 2021-04-13 18:24:24 +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
Yan Yan
7a50e7f206 Merge "Use IkeProtocolException#getErrorType() to identify a specific error" 2021-04-13 17:21:46 +00:00
TreeHugger Robot
b720d6166c [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 60dde1dd13 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib396f0771960707529cb7488a50692408c0cd157
 2021-04-13 17:12:30 +00: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
fc8d11d431 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 79b99b4cc7 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I6235ca223d068ff9d4baf35cc7579a6145da29d1
 2021-04-13 16:27:07 +00:00
TreeHugger Robot
902477724a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 0f57ff1fe7 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I84845217fc90a2df2ef96370e763d998d0f24c5c
 2021-04-13 16:26:33 +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
cd1edf4e57 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: c55482fcde -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I45243cc6fe8fe6071de9513dd8eef041b679d3fe
 2021-04-13 16:04:31 +00:00
Treehugger Robot
a11cd96d52 Merge "OOB: Implement getLocalOutOfBand API" am: c1349d4c56 am: 0087b62300 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1662621

Change-Id: I158b4ade653fd94d2a2d14075a78c0fae74dbd06
 2021-04-13 16:04:08 +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
Anton Hansson
d7b991b329 Merge "Remove disabling of errorprone checks for stubs" am: 34fb03a88f am: 24eb9ef668 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1671725

Change-Id: Ia6cda02b38495a92a6104e1202ce6e6c6d1f8dad
 2021-04-13 15:41:29 +00:00
Treehugger Robot
fcad15e9eb Merge "CEC: Implement handleReportArcTermination method" am: 9026f587b7 am: e0351bf49f 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1589692

Change-Id: I226e0405d87c5e8118335c0b2dc7b7a5747924ff
 2021-04-13 15:41:13 +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
Anton Hansson
ceebf83ddb Merge changes I5719ba0f,I5f3106b7,I3fd90c2d am: fd7056c7c9 am: 7f06596361 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1673390

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

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

Change-Id: Id6e54b03046bff5e5df85ba5ceeaacdac57b28f5
 2021-04-13 14:36:07 +00:00
Jeff Sharkey
20d60d45d6 Merge "uwb: Add owners for uwb service" am: 15ee3b3c0e am: 6bc88ceb5d 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1673236

Change-Id: I7efc1e28bf4317d1add5abc6b242babe86b1f0ac
 2021-04-13 14:34:54 +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
62f16e59e1 Merge "Export monolithic hidden api files to the dist" am: f94ff5a36e am: 26efc48ba8 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1673385

Change-Id: I85a771a4c64241a93a48de8161722e2700047b96
 2021-04-13 12:15:17 +00: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
Chiachang Wang
155b09614e Merge "Make getUid a method on UserHandle itself instead of static" am: bd1cc4f2a2 am: 6b7167e807 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1669185

Change-Id: Icc006ab751a1a03aa3c09c1999a6141ff061081d
 2021-04-13 11:54:57 +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
b92605cc81 Merge "Add SDK version check to skip S added API test" am: 739195c5b0 am: a8ae705499 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1673167

Change-Id: I057a0d7c6a8697e301f6aa1b37088140d0cc8bb6
 2021-04-13 06:02:20 +00:00