Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
550,668 Commits 3 Branches 0 Tags
a7b5165e3b36da0ea9d130b369cf641ef0ab70f1
Commit Graph

550668 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Treehugger Robot
a7b5165e3b Merge "Update MediaSessionService to comply with Android's inclusive language guidance" am: fc236dbda4 am: 3335cb4a3c am: ff6f1c5ead am: bd1b8ff06c 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1402408

Change-Id: I5b33ca0d4777cce8010573ba5ab182761b550192
 2020-08-18 04:44:53 +00:00
Treehugger Robot
bd1b8ff06c Merge "Update MediaSessionService to comply with Android's inclusive language guidance" am: fc236dbda4 am: 3335cb4a3c am: ff6f1c5ead 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1402408

Change-Id: Ib0114b9c32c7b062586472570e1cb565eed452ae
 2020-08-18 04:23:47 +00:00
Jeff Chang
db5cafa88b Merge "[RESTRICT AUTOMERGE] Update the visibility of activities on sleeping display" into rvc-qpr-dev am: 2c1181ccbf 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12325673

Change-Id: I77127df693a6966c2b8554b54e0db7618e15060c
 2020-08-18 04:11:11 +00:00
Jeff Chang
c87c31ec0e [RESTRICT AUTOMERGE] Update the visibility of activities on sleeping display am: 73d6c7926d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12325673

Change-Id: If6195c0ecb0a36afa522eb92615bbcce12d7ef51
 2020-08-18 04:10:59 +00:00
Treehugger Robot
ff6f1c5ead Merge "Update MediaSessionService to comply with Android's inclusive language guidance" am: fc236dbda4 am: 3335cb4a3c 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1402408

Change-Id: I9bbc796eec14b26eb7237f6a45bd374c696755b5
 2020-08-18 04:10:44 +00:00
Jeff Chang
2c1181ccbf Merge "[RESTRICT AUTOMERGE] Update the visibility of activities on sleeping display" into rvc-qpr-dev 2020-08-18 03:52:03 +00:00
Treehugger Robot
3335cb4a3c Merge "Update MediaSessionService to comply with Android's inclusive language guidance" am: fc236dbda4 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1402408

Change-Id: I26584e716869df745749ae50a859b9dca3af2f27
 2020-08-18 03:51:57 +00:00
Treehugger Robot
d013c0ac14 Merge "Update InputMethodInfo to comply with Android's inclusive language guidance" am: 2e1b52b1d1 am: 453023d999 am: cb5c7ad1fa am: bd9e396d1c 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1401337

Change-Id: Ie40b2f4241e4ed952f95fe41590e93243999aff6
 2020-08-18 03:51:02 +00:00
Treehugger Robot
fc236dbda4 Merge "Update MediaSessionService to comply with Android's inclusive language guidance" 2020-08-18 03:40:15 +00:00
Treehugger Robot
bd9e396d1c Merge "Update InputMethodInfo to comply with Android's inclusive language guidance" am: 2e1b52b1d1 am: 453023d999 am: cb5c7ad1fa 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1401337

Change-Id: Ia225a60079ace7062e7082be0e7f768dde5f908f
 2020-08-18 03:38:49 +00:00
Wilson Wu
9a6205d3f3 Update MediaSessionService to comply with Android's inclusive language guidance 
See https://source.android.com/setup/contribute/respectful-code for reference


Bug: 162536543
Test: Treehugger
Change-Id: Ic428608681afb29083866cd3163c06e572984191
 2020-08-18 03:36:55 +00:00
Treehugger Robot
cb5c7ad1fa Merge "Update InputMethodInfo to comply with Android's inclusive language guidance" am: 2e1b52b1d1 am: 453023d999 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1401337

Change-Id: If474261934e1e78e5144b80804e95818e73b8b0c
 2020-08-18 03:26:28 +00:00
Treehugger Robot
453023d999 Merge "Update InputMethodInfo to comply with Android's inclusive language guidance" am: 2e1b52b1d1 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1401337

Change-Id: I7b074c0e145e5900c189bdd5d8faf97f01554e45
 2020-08-18 03:17:35 +00:00
Treehugger Robot
2e1b52b1d1 Merge "Update InputMethodInfo to comply with Android's inclusive language guidance" 2020-08-18 03:08:09 +00:00
Eric Laurent
3428e2f956 Merge "audio: add device definitions for BLE Audio" into rvc-dev-plus-aosp am: 6605a82524 am: e2b9de76dc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12373865

Change-Id: I6efc88aeeb57428a2855178db95bd05328e8d29c
 2020-08-18 02:04:12 +00:00
Eric Laurent
e2b9de76dc Merge "audio: add device definitions for BLE Audio" into rvc-dev-plus-aosp am: 6605a82524 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12373865

Change-Id: Idb77fb138c670300879720e70f65c1d0914f66fe
 2020-08-18 01:53:17 +00:00
Eric Laurent
6605a82524 Merge "audio: add device definitions for BLE Audio" into rvc-dev-plus-aosp 2020-08-18 01:36:12 +00:00
Kyunglyul Hyun
cf04b9f6a0 Merge "MediaRouter: Create BluetoothRouteProvider for each user" into rvc-qpr-dev am: 907ba21f9f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12390943

Change-Id: I254be23daa9526303898e6a72249df050e585c06
 2020-08-18 00:47:04 +00:00
Automerger Merge Worker
18e96e0819 Merge "Merge "Update docs to clarify how providers can create style bundles and Slices for inline suggestions." into rvc-dev am: 18cff6082d am: 6128b1ba0f am: 01d9441cec" into rvc-qpr-dev-plus-aosp 2020-08-18 00:46:35 +00:00
TreeHugger Robot
9feeb14908 Merge "Update docs to clarify how providers can create style bundles and Slices for inline suggestions." into rvc-dev am: 18cff6082d am: 5f6a8ef665 am: 77b7a38d68 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12265211

Change-Id: I2bb3247b701b250a54f52465b35d5f0537b57cf9
 2020-08-18 00:46:25 +00:00
TreeHugger Robot
4ed4411884 Merge "Update docs to clarify how providers can create style bundles and Slices for inline suggestions." into rvc-dev am: 18cff6082d am: 6128b1ba0f am: 01d9441cec 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12265211

Change-Id: If0f4a21ff6dc7783399eec919c6409706cc6becf
 2020-08-18 00:46:14 +00:00
TreeHugger Robot
74698fc87a Merge "Update docs to clarify how providers can create style bundles and Slices for inline suggestions." into rvc-dev am: 18cff6082d am: 6128b1ba0f am: ea8b670196 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12265211

Change-Id: I38ea717accd07eae665e625eb6f12c0a6be811a3
 2020-08-18 00:46:05 +00:00
Kyunglyul Hyun
907ba21f9f Merge "MediaRouter: Create BluetoothRouteProvider for each user" into rvc-qpr-dev 2020-08-18 00:39:19 +00:00
TreeHugger Robot
77b7a38d68 Merge "Update docs to clarify how providers can create style bundles and Slices for inline suggestions." into rvc-dev am: 18cff6082d am: 5f6a8ef665 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12265211

Change-Id: I347d2883a250dad5b3810c58bd92aacab456b7c8
 2020-08-18 00:35:25 +00:00
TreeHugger Robot
01d9441cec Merge "Update docs to clarify how providers can create style bundles and Slices for inline suggestions." into rvc-dev am: 18cff6082d am: 6128b1ba0f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12265211

Change-Id: I83317ac5a0f2d33ff2403a0b3777f06a15fc347b
 2020-08-18 00:35:23 +00:00
TreeHugger Robot
ea8b670196 Merge "Update docs to clarify how providers can create style bundles and Slices for inline suggestions." into rvc-dev am: 18cff6082d am: 6128b1ba0f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12265211

Change-Id: I3b25303b51dd10b649726c13a6aff7cc82f4e18f
 2020-08-18 00:35:15 +00:00
TreeHugger Robot
5f6a8ef665 Merge "Update docs to clarify how providers can create style bundles and Slices for inline suggestions." into rvc-dev am: 18cff6082d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12265211

Change-Id: I35fa0ba127e5c73a46fe6ddff4428956a4e33eb2
 2020-08-18 00:24:57 +00:00
TreeHugger Robot
6128b1ba0f Merge "Update docs to clarify how providers can create style bundles and Slices for inline suggestions." into rvc-dev am: 18cff6082d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12265211

Change-Id: Ib0e9657c1d796cfcf9f5aa89709b9ad357d81f23
 2020-08-18 00:24:55 +00:00
TreeHugger Robot
18cff6082d Merge "Update docs to clarify how providers can create style bundles and Slices for inline suggestions." into rvc-dev 2020-08-18 00:14:21 +00:00
Calvin Huang
c4abf3dcd9 Merge "Fix CtsIncidentHostTestCases for RVC AAOS emulator" into rvc-qpr-dev am: 013474d332 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12287561

Change-Id: I818c7bcea88c4976c54f660ce2c72db7f1339582
 2020-08-17 23:41:18 +00:00
Calvin Huang
013474d332 Merge "Fix CtsIncidentHostTestCases for RVC AAOS emulator" into rvc-qpr-dev 2020-08-17 23:26:16 +00:00
Tom Cherry
16abd846f9 [automerger skipped] Merge "Include log/log_read.h for reading logs" am: 7e3435208a am: a15f00fbce -s ours am: bc551a75fe -s ours am: ce4394353a -s ours 
am skip reason: Change-Id I3c7719bcbffc6809377e80292b00312b4598bfc2 with SHA-1 dfef6b76c9 is in history

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

Change-Id: I1a5b5046f042fed57efa1a0bb0a76f860c3763d8
 2020-08-17 21:23:45 +00:00
Tom Cherry
ce4394353a [automerger skipped] Merge "Include log/log_read.h for reading logs" am: 7e3435208a am: a15f00fbce -s ours am: bc551a75fe -s ours 
am skip reason: Change-Id I3c7719bcbffc6809377e80292b00312b4598bfc2 with SHA-1 dfef6b76c9 is in history

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

Change-Id: Ib30dfa12d41db1e743ca0f0c772d5e71df5cb690
 2020-08-17 21:12:28 +00:00
Tom Cherry
bc551a75fe [automerger skipped] Merge "Include log/log_read.h for reading logs" am: 7e3435208a am: a15f00fbce -s ours 
am skip reason: Change-Id I3c7719bcbffc6809377e80292b00312b4598bfc2 with SHA-1 dfef6b76c9 is in history

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

Change-Id: I478ba1572e0332b6d850b18ccacf54a762b77745
 2020-08-17 20:59:39 +00:00
Tom Cherry
a15f00fbce Merge "Include log/log_read.h for reading logs" am: 7e3435208a 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1402652

Change-Id: Ic8b7992e3bdf91dc3d3d292b9433086b5df8e7de
 2020-08-17 20:47:53 +00:00
TreeHugger Robot
73f4897f80 Merge "Rename game driver to updatable driver." into rvc-dev-plus-aosp am: 377b7f318d am: f6d2c0abc5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12375470

Change-Id: Ib327facf7026ac4f406846128c84005478fd2d2c
 2020-08-17 20:38:28 +00:00
Tom Cherry
7e3435208a Merge "Include log/log_read.h for reading logs" 2020-08-17 20:30:21 +00:00
TreeHugger Robot
f6d2c0abc5 Merge "Rename game driver to updatable driver." into rvc-dev-plus-aosp am: 377b7f318d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12375470

Change-Id: Ief345ee98cd8758baa1adde984abe01a753dce5c
 2020-08-17 20:25:52 +00:00
Treehugger Robot
be051117ba [automerger skipped] Merge "Check 64-to-32-bit transition in system_server for Tagged Ptrs [#2]." am: fbe9d7e821 am: 19740a4726 -s ours am: 23a355bdb2 -s ours am: ad51a77a59 -s ours 
am skip reason: Change-Id Ida6aa56093de6b6b03e78e6295bea546219ad864 with SHA-1 ba160a28fd is in history

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

Change-Id: I6c7ae6fbd136fb6b4d6d71b8a9a81238b5bd58d2
 2020-08-17 20:16:59 +00:00
TreeHugger Robot
377b7f318d Merge "Rename game driver to updatable driver." into rvc-dev-plus-aosp 2020-08-17 20:11:11 +00:00
Treehugger Robot
ad51a77a59 [automerger skipped] Merge "Check 64-to-32-bit transition in system_server for Tagged Ptrs [#2]." am: fbe9d7e821 am: 19740a4726 -s ours am: 23a355bdb2 -s ours 
am skip reason: Change-Id Ida6aa56093de6b6b03e78e6295bea546219ad864 with SHA-1 ba160a28fd is in history

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

Change-Id: Icd82d7a56e4cba4201a4406194e53b8fa638a033
 2020-08-17 20:07:09 +00:00
Sarah Chin
8e137b92a1 Merge "Update NR TAC limit to 3 bytes" into rvc-qpr-dev am: be05cd4b40 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12367462

Change-Id: I3af44374122e6dde1129e46e7bacc74326da8106
 2020-08-17 19:53:49 +00:00
Treehugger Robot
23a355bdb2 [automerger skipped] Merge "Check 64-to-32-bit transition in system_server for Tagged Ptrs [#2]." am: fbe9d7e821 am: 19740a4726 -s ours 
am skip reason: Change-Id Ida6aa56093de6b6b03e78e6295bea546219ad864 with SHA-1 ba160a28fd is in history

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

Change-Id: Ic5e0d367548de4b97e4e7f4f8bc8ff7224f8b8af
 2020-08-17 19:49:30 +00:00
Sarah Chin
be05cd4b40 Merge "Update NR TAC limit to 3 bytes" into rvc-qpr-dev 2020-08-17 19:42:11 +00:00
Treehugger Robot
19740a4726 Merge "Check 64-to-32-bit transition in system_server for Tagged Ptrs [#2]." am: fbe9d7e821 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1286133

Change-Id: I46a3fd84de5c524205d0282687780bd12b9b4b41
 2020-08-17 19:39:15 +00:00
Treehugger Robot
fbe9d7e821 Merge "Check 64-to-32-bit transition in system_server for Tagged Ptrs [#2]." 2020-08-17 19:25:56 +00:00
Fabian Kozynski
a7149e7a53 Merge "Add MODIFY_AUDIO_ROUTING permission to systemui" into rvc-qpr-dev am: d951edaa48 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12378082

Change-Id: I2d29f6eec37ad75c83fd8e96351061116929a54a
 2020-08-17 19:01:48 +00:00
Fabian Kozynski
d951edaa48 Merge "Add MODIFY_AUDIO_ROUTING permission to systemui" into rvc-qpr-dev 2020-08-17 18:40:14 +00:00
Tom Cherry
94891ea6c6 Include log/log_read.h for reading logs 
log/log.h is concerned with writing logs.

Bug: 78370064
Test: build
Merged-In: I3c7719bcbffc6809377e80292b00312b4598bfc2
Change-Id: I3c7719bcbffc6809377e80292b00312b4598bfc2
 2020-08-17 18:25:17 +00:00
Sudheer Shanka
88aebd1fb1 Merge "Update language to comply with Android’s inclusive language guidance." am: 255d5a9270 am: 3e43926852 am: 9dece9ac42 am: 84a8f10f16 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1401261

Change-Id: Iee859a7bb5bf50ef1b7ab13af802e574fd080be8
 2020-08-17 18:16:42 +00:00