Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
519,022 Commits 3 Branches 0 Tags
c19fd3c4cba0f02a1ef8a897a4aa6e00a6e3df93
Commit Graph

519022 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Eric Laurent
f976180608 audio: add device definitions for BLE Audio 
Add device type enums for BLE Audio.
Device types for BLE audio headset and BLE audio speaker are added
to AudioDeviceInfo class.
Conversions to internal device types are added to AudioSystem.
(cherry picked from commit 6239d7ee87)

Bug: 161358428
Test: make flash and boot
Change-Id: I0a39ffc49c0e7e5b36975656a33a2dd2946b60b7
Merged-In: I0a39ffc49c0e7e5b36975656a33a2dd2946b60b7
 2020-08-18 06:03:21 +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
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
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
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
Meng Wang
f3c71997ee Add KEY_VOICE_OVER_WIFI_ENTITLEMENT_ID 
Bug: 164250692
Test: make
Change-Id: I917085cf6f962c7f5cc7088e2e5298597f661514
Merged-In: I917085cf6f962c7f5cc7088e2e5298597f661514
 2020-08-18 02:22:11 +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
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
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
Elliott Hughes
a3edc25cda Remove unused #include. 
The header is obsolete anyway: new code should just use static_assert.

Test: treehugger
Change-Id: I407ba6e90302557aa8e2604bdd2c6d9129353e9e
 2020-08-17 15:59:52 -07: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
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
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
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
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
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
84a8f10f16 Merge "Update language to comply with Android’s inclusive language guidance." am: 255d5a9270 am: 3e43926852 am: 9dece9ac42 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1401261

Change-Id: I80af4aca41f2b00af7e96b7a44be2398983a6a73
 2020-08-17 18:07:56 +00:00
Sudheer Shanka
9dece9ac42 Merge "Update language to comply with Android’s inclusive language guidance." am: 255d5a9270 am: 3e43926852 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1401261

Change-Id: I6a01805d09d82038590887ba333a24fbbf12a2d1
 2020-08-17 17:52:49 +00:00
Sudheer Shanka
3e43926852 Merge "Update language to comply with Android’s inclusive language guidance." am: 255d5a9270 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1401261

Change-Id: I9bd7fef3a277994f8d72fcf08122eac1e6c5d951
 2020-08-17 17:40:59 +00:00
Sudheer Shanka
255d5a9270 Merge "Update language to comply with Android’s inclusive language guidance." 2020-08-17 17:27:21 +00:00
Anton Hansson
912622f711 Compose the main stubs jars from module stubs 
This adds stub generation for the non-updatable part of the platform,
and changes the full stub jars to be a combination of multiple jars:
the stubs of the updatable modules and the stubs of the remaining part
of the platform.

Composing the stub jars like this allows overriding the individual parts
with prebuilts rather than building everything from source. This makes
the build safer, as we can make sure that the stub of the apex that is
used is also what is used to build the rest of the platform against.

The monolithic droidstubs rules remain for now, as it has other
functions than generating stub sources (api lint, current.txt,
checklast). It remains a goal to get rid of this, but by submitting this
CL first it can be done in steps.

Bug: 144149403
Test: m android{,_system}_{monolith,merged}_stubs_current
Test: m
Change-Id: I255486112c03f237aa342cfb93f3b473a2f50470
Merged-In: I255486112c03f237aa342cfb93f3b473a2f50470
(cherry picked from commit 3c1b15a3dea5486b57d3bf1d60a7b7170494274e)
 2020-08-17 17:02:47 +01:00
Anton Hansson
c05909e146 Tweak stubs for updatable media 
- Add variant for public APIs
- Build against module_current

This is a partial cherry-pick of the CL
I498823de7315f78121975d36d6dc7667a8245085,
which are required by other CLs.

Bug: 147768409
Test: m
Merged-In: I498823de7315f78121975d36d6dc7667a8245085
Change-Id: I811a8a5ff0bda4872ecf7dd62c380fb89a53bf67
 2020-08-17 17:01:10 +01:00
Orion Hodson
7cebdeeb53 profman: inclusive language updates 
Based on:
  https://source.android.com/setup/contribute/respectful-code

Bug: 161336379
Bug: 161896447
Test: m
Change-Id: Iaf7db2f76d8979f1ccc06c7e9e705b69c1f8069d
 2020-08-17 15:35:31 +01:00
Anton Hansson
cf42e98eef Make framework-res dep in stubs explicit 
The android.jar stubs includes the resource from framework-res. This
dependency was previously added implicitly inside the build system, but
using a java_genrule we can add it directly, which makes it easier to
make changes to this rule.

This change has the side-effect of adding the resources to some stubs
that did not previously include the resources (e.g. module-libs), which
I think is desired.

Bug: 161214753
Test: build sdk, diff out/dist before and after (shows resources added
      to some stubs)
Change-Id: I1829789af207cc45c49c0c68369fc7c0c085bcb0
Merged-In: I1829789af207cc45c49c0c68369fc7c0c085bcb0
 2020-08-17 12:05:51 +01:00
Nikolas Havrikov
0179047fef Add GET_INTENT_SENDER_INTENT permission to Shell 
This is needed for a CTS test for picture-in-picture on TV.

As per go/privapp-permission:
1. This is the exact permission that guards specifically the
`PendingIntent::getIntent` method which is used in the test.

2. Two alternatives were considered:
a) Create another permisison and `@hide` it. However, this offers no
security benefit at the cost of maintenance overhead.
b) Do not create the test in the first place.

Bug: 153435517
Test: atest CtsSystemUiTestCases:PipNotificationTests
Change-Id: I04a5c82334a676351828fb82f2ac5886c888a0bc
 2020-08-17 09:51:26 +00:00
Hai Zhang
a710a30457 DO NOT MERGE Don't allow non-instant permissions for instant apps. 
Bug: 140256621
Test: atest EphemeralTest
Change-Id: Id07342c0347c0b4d2ccb3f58a4af9fda7a20d6ef
 2020-08-17 07:40:45 +00:00
Hai Zhang
8b9393f4f4 DO NOT MERGE Don't allow non-instant permissions for instant apps. 
Bug: 140256621
Test: atest EphemeralTest
Change-Id: Id07342c0347c0b4d2ccb3f58a4af9fda7a20d6ef
 2020-08-17 07:38:49 +00:00
Hai Zhang
741e955d12 DO NOT MERGE Don't allow non-instant permissions for instant apps. 
Bug: 140256621
Test: atest EphemeralTest
Change-Id: Id07342c0347c0b4d2ccb3f58a4af9fda7a20d6ef
 2020-08-17 07:36:57 +00:00
Hai Zhang
d83e3a350d DO NOT MERGE Don't allow non-instant permissions for instant apps. 
Bug: 140256621
Test: atest EphemeralTest
Change-Id: Id07342c0347c0b4d2ccb3f58a4af9fda7a20d6ef
 2020-08-17 07:33:11 +00:00
Jackal Guo
c6564bee2a Merge "Update language to comply with Android's inclusive language guidance" am: 0090d82f18 am: c3972b8d97 am: 460fc577c9 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1398286

Change-Id: Ia18cae33d2efc71f61c1a2a37b25a1fb2147ccfb
 2020-08-17 01:43:16 +00:00
Jackal Guo
460fc577c9 Merge "Update language to comply with Android's inclusive language guidance" am: 0090d82f18 am: c3972b8d97 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1398286

Change-Id: Iefb939a07702b1aecfab75a03decf85ab6b55b50
 2020-08-17 01:30:51 +00:00
Jackal Guo
c3972b8d97 Merge "Update language to comply with Android's inclusive language guidance" am: 0090d82f18 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1398286

Change-Id: I8a7c4e226ccd6bd97381dcb0a3f3ce53a01172a8
 2020-08-17 01:18:39 +00:00
Jackal Guo
0090d82f18 Merge "Update language to comply with Android's inclusive language guidance" 2020-08-17 01:08:02 +00:00
TreeHugger Robot
6e7c7f5c3f [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev am: 6efe87eec6 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ia80209602a8d220ce95cc0f47ede58ab8543e6b8
 2020-08-15 18:38:38 +00:00
TreeHugger Robot
e3a0005da9 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev am: 56018c905c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I69843e70c9e74a6544a1d8539b488297a9824e58
 2020-08-15 18:38:05 +00:00
TreeHugger Robot
469a7b7dd3 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev am: cdb13fb2bc -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ia9028072324a2f3866abbfa996d0885b04d947b9
 2020-08-15 18:37:36 +00:00