Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
561,886 Commits 3 Branches 0 Tags
d85294307263bdd68d1b1d9ff428ccca835558d7
Commit Graph

561886 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brian Stack
d852943072 Merge "Ensure UWB conforms to API guidelines" am: 0070e26a5e am: a0e1666a74 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1518203

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I561ea72833cbadcae45cff01edf310fee80c6532
 2020-12-16 01:05:55 +00:00
Brian Stack
a0e1666a74 Merge "Ensure UWB conforms to API guidelines" am: 0070e26a5e 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1518203

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I827e18f97985aeeeaa922432f539bc0f27c96025
 2020-12-16 00:28:33 +00:00
Brian Stack
0070e26a5e Merge "Ensure UWB conforms to API guidelines" 2020-12-16 00:01:26 +00:00
Jakub Pawlowski
14b8b7fca2 Merge "Add LE Audio UUID placeholder" am: eec09803da am: b253796204 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1513324

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0461b86760f5c26bf066799b8bf6452ac2162704
 2020-12-15 22:12:21 +00:00
Jeff Sharkey
d4745bc103 Merge "Add missing OWNERS files to UWB" am: 6591e70397 am: 9ffe8e1bf3 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1530981

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6432fd319a3f6213024c6cdd91a3527b3efca05a
 2020-12-15 22:12:13 +00:00
Treehugger Robot
42d3d9f4ae Merge changes Ieae66cc7,Idf94ddb5 am: 7d486bd054 am: 14659d0a88 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1512886

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia8a3291e3b5a8641ca9cd883c6c24b16ab2aa17a
 2020-12-15 22:12:02 +00:00
Jeff Sharkey
ae4ddcdeef Merge "Add OWNERS to UWB" am: 6d76b53c26 am: 0eb1190094 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1530840

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7ed1eab500c1c67ac99e955b0ce9b173e12e4820
 2020-12-15 22:11:49 +00:00
Jakub Pawlowski
b253796204 Merge "Add LE Audio UUID placeholder" am: eec09803da 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1513324

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9a86c322ef50db2aefcc3a3862f68d332e8e0b5d
 2020-12-15 22:09:01 +00:00
Jeff Sharkey
9ffe8e1bf3 Merge "Add missing OWNERS files to UWB" am: 6591e70397 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1530981

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3a282d7f37bd531ffa69065110a45efb9d18d40a
 2020-12-15 22:06:11 +00:00
Treehugger Robot
14659d0a88 Merge changes Ieae66cc7,Idf94ddb5 am: 7d486bd054 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1512886

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1c380bab3d814c44d4df5b0267fe45ee1f2d6f0f
 2020-12-15 22:00:48 +00:00
Jeff Sharkey
0eb1190094 Merge "Add OWNERS to UWB" am: 6d76b53c26 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1530840

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2386ee3dbc4561a6afa71c2fa50303ba16f518e5
 2020-12-15 21:57:03 +00:00
Jakub Pawlowski
eec09803da Merge "Add LE Audio UUID placeholder" 2020-12-15 21:54:45 +00:00
Jeff Sharkey
6591e70397 Merge "Add missing OWNERS files to UWB" 2020-12-15 21:43:02 +00:00
Treehugger Robot
7d486bd054 Merge changes Ieae66cc7,Idf94ddb5 
* changes:
  CEC : Add additional constraint to validate physical address
  CEC : Add validator for tuner device status message
 2020-12-15 21:38:51 +00:00
Brian Stack
6c0a9094a5 Add missing OWNERS files to UWB 
Bug: 175698723
Test: Manual
Change-Id: I4d4d9489f110efc85ce96fe7d37f7acc7bd82341
 2020-12-15 13:35:47 -08:00
Treehugger Robot
a911905de0 Merge "iorap: Terminate iorapd process when both tracing and prefetching are off." am: 8ac80b0915 am: 6a6ee5f318 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1522026

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I65a607cb96c4e8560bb74c7948f3ca027134f3b7
 2020-12-15 21:28:22 +00:00
Peiyong Lin
60cc40c831 [automerger skipped] Merge "[GraphicsEnvironment] Avoid null access." am: 393215e245 am: 181ff65039 -s ours 
am skip reason: Change-Id I4f3b86b0a8cfff4fc608b3a59ebf0872db0465ff with SHA-1 d22eebefdb is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I00d8c7f20a08ffd5682d793280a4e0e17af76615
 2020-12-15 21:28:08 +00:00
Jeff Sharkey
6d76b53c26 Merge "Add OWNERS to UWB" 2020-12-15 21:20:54 +00:00
Treehugger Robot
6a6ee5f318 Merge "iorap: Terminate iorapd process when both tracing and prefetching are off." am: 8ac80b0915 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1522026

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I52a5012d525d1556acf24b6e13734f72602832e9
 2020-12-15 20:54:14 +00:00
Peiyong Lin
181ff65039 Merge "[GraphicsEnvironment] Avoid null access." am: 393215e245 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1530839

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5af8bb8a0d5f1b6d4bb9b26e8e049720135b5109
 2020-12-15 20:38:00 +00:00
Treehugger Robot
8ac80b0915 Merge "iorap: Terminate iorapd process when both tracing and prefetching are off." 2020-12-15 20:36:52 +00:00
Peiyong Lin
393215e245 Merge "[GraphicsEnvironment] Avoid null access." 2020-12-15 20:10:47 +00:00
Peiyong Lin
28613f9d31 Merge "[GraphicsEnvironment] Avoid null access." into rvc-qpr-dev am: 23ace73ac4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13229183

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I20f201739a456f9580328670189e506e284feb2e
 2020-12-15 19:10:01 +00:00
Peiyong Lin
23ace73ac4 Merge "[GraphicsEnvironment] Avoid null access." into rvc-qpr-dev 2020-12-15 19:02:54 +00:00
TreeHugger Robot
1a238e24c3 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 29b5a3f06e -s ours 
am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iedeacfd4d759a7addf9b56c221a5d20bf541a89a
 2020-12-15 18:49:18 +00:00
TreeHugger Robot
e2e92ac8b4 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: a601f31dce -s ours 
am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia06238f0e4f7a7da926e8ed151668df11d698582
 2020-12-15 18:48:53 +00:00
TreeHugger Robot
946b5ee77a Merge "Combine uids for CpuTimePerUidFreq atom" into rvc-qpr-dev am: 9622b6d7d0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13205190

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id450db7d6874e2e1f4832b8dc0c40f972d62bf18
 2020-12-15 18:48:15 +00:00
TreeHugger Robot
29b5a3f06e Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev 2020-12-15 18:47:44 +00:00
TreeHugger Robot
a601f31dce Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev 2020-12-15 18:45:06 +00:00
Nicolas Geoffray
df634d7c4e Merge "Make Class.getPackageName public." am: 3a76c4c9aa am: 7a0acb4d34 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1519502

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia30633196eef2c2fdbebde3ad87c9e19c3c8b58e
 2020-12-15 18:28:30 +00:00
Brian Stack
bf2f411e26 Add OWNERS to UWB 
Bug: 175698723
Test: Manual
Change-Id: Ia1982ed3864bbffcce5f4f9192a3cb681085e387
 2020-12-15 10:26:49 -08:00
Peiyong Lin
3cb225dc74 [GraphicsEnvironment] Avoid null access. 
Currently when debug layer apk is not installed, GraphicsEnvironment
logs the message and proceeds, which results in null pointer access
crash when later trying to access primaryAbi. Avoid null access by an
early return statement.

Bug: N/A
Test: specify not installed debug layer apk and no crash
Change-Id: I4f3b86b0a8cfff4fc608b3a59ebf0872db0465ff
Merged-In: I4f3b86b0a8cfff4fc608b3a59ebf0872db0465ff
(cherry picked from commit c5c17e66ba)
 2020-12-15 10:22:53 -08:00
Peiyong Lin
d22eebefdb [GraphicsEnvironment] Avoid null access. 
Currently when debug layer apk is not installed, GraphicsEnvironment
logs the message and proceeds, which results in null pointer access
crash when later trying to access primaryAbi. Avoid null access by an
early return statement.

Bug: b/175699044
Test: specify not installed debug layer apk and no crash
Change-Id: I4f3b86b0a8cfff4fc608b3a59ebf0872db0465ff
Merged-In: I4f3b86b0a8cfff4fc608b3a59ebf0872db0465ff
(cherry picked from commit c5c17e66ba)
 2020-12-15 17:54:45 +00:00
TreeHugger Robot
9622b6d7d0 Merge "Combine uids for CpuTimePerUidFreq atom" into rvc-qpr-dev 2020-12-15 17:48:53 +00:00
Nicolas Geoffray
7a0acb4d34 Merge "Make Class.getPackageName public." am: 3a76c4c9aa 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1519502

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id82c4473902d0ca0ae31b4c7b7d4c9939bfe0bc6
 2020-12-15 17:36:13 +00:00
Nicolas Geoffray
3a76c4c9aa Merge "Make Class.getPackageName public." 2020-12-15 16:55:44 +00:00
Alison Cichowlas
1a55495ae9 Merge "Add SystemUI to OWNERS for Sharesheet." am: eff7324d9c am: ace8f705bc 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1525899

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6fc43cc854488c505479de6461ed56e02916955b
 2020-12-15 15:50:36 +00:00
Baligh Uddin
f9933a9558 [automerger skipped] Merge "Migrate to frameworks/proto_logging/stats" am: 474ccaacd2 -s ours am: eeb48e12d4 -s ours 
am skip reason: Change-Id Id85494f7f40a0201061e74fbf3f08f70a632a62c with SHA-1 73802a1802 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0baaaed4ac3f2c9e06aa3ae3b967349055e4c9da
 2020-12-15 15:50:28 +00:00
Alison Cichowlas
ace8f705bc Merge "Add SystemUI to OWNERS for Sharesheet." am: eff7324d9c 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1525899

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I73decbc839f7c7a89c61927573c1c0a45f81ae55
 2020-12-15 15:47:07 +00:00
Jeff Sharkey
ee5e869054 Merge "Update the owner file for recovery system tests" am: 99388fe4a9 am: ff4f8415e1 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1529741

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I29e696ecccecfbf37a68f4d526a6aa545bdb18b7
 2020-12-15 15:44:38 +00:00
Charles Chen
053510307c Merge "Make everyone able to modify mock package" am: c3c6148928 am: 531ac1780d 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1529960

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1c259607073cb89aa053fbeac3858907e00b5371
 2020-12-15 15:44:08 +00:00
Baligh Uddin
53038e17a7 [automerger skipped] Merge "Migrate to frameworks/proto_logging/stats" into stage-aosp-master am: 9218917ebb -s ours 
am skip reason: Change-Id I30180ec8e75f6c619dbe8492e74324d2e38d6a3f with SHA-1 4e1fe29cf0 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iaf14cbc454ff3fdfa4ba2fd483d5a6b5f6d0e1f0
 2020-12-15 15:43:34 +00:00
Baligh Uddin
eeb48e12d4 [automerger skipped] Merge "Migrate to frameworks/proto_logging/stats" am: 474ccaacd2 -s ours 
am skip reason: Change-Id Id85494f7f40a0201061e74fbf3f08f70a632a62c with SHA-1 73802a1802 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8f47d8a6b9204d784742f44181505f4e6713b413
 2020-12-15 15:40:59 +00:00
Jeff Sharkey
ff4f8415e1 Merge "Update the owner file for recovery system tests" am: 99388fe4a9 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1529741

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I23b49e940a96802fc562a120a045e8ad549da28e
 2020-12-15 15:37:53 +00:00
Charles Chen
531ac1780d Merge "Make everyone able to modify mock package" am: c3c6148928 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1529960

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I185904c92b7436803a6da6c237f0ab8aedc1515f
 2020-12-15 15:34:41 +00:00
Alison Cichowlas
eff7324d9c Merge "Add SystemUI to OWNERS for Sharesheet." 2020-12-15 15:08:10 +00:00
Baligh Uddin
474ccaacd2 Merge "Migrate to frameworks/proto_logging/stats" 2020-12-15 15:06:36 +00:00
Baligh Uddin
cfea49246b Migrate to frameworks/proto_logging/stats 
BUG: 175318992
Test: TH
Merged-In: Id85494f7f40a0201061e74fbf3f08f70a632a62c
Change-Id: I8bee7a0a6acecc1274d5acc0adb44c5dde8862e4
 2020-12-15 15:05:53 +00:00
Baligh Uddin
9218917ebb Merge "Migrate to frameworks/proto_logging/stats" into stage-aosp-master 2020-12-15 15:05:05 +00:00
Baligh Uddin
86a5ca2c14 Merge "Migrate to frameworks/proto_logging/stats" into rvc-qpr-dev-plus-aosp 2020-12-15 15:04:45 +00:00