Commit Graph

1784 Commits

Author SHA1 Message Date
Vishnu Nair
904ea67724 Misc clean up before requesting focus via setFocusedWindow api
Replace focus changed callback to use the callback from InputDispatcher.
Currently the system posts a message and informs accessibility services,
window focus observers and window change listeners. With the exception
of accessibility service (which requires to be notified before the
client gets notified), the other callbacks should be synchronized with
the callback from InputDispatcher.

This change also cleans up null checks for ActivityRecord#appToken
since it cannot be null.

Test: presubmit
Bug: 151179149
Change-Id: Id79553835048c090505589d62dee9cb8f38f23ff
2020-08-26 10:30:39 -07:00
Winson Chung
b754f5281b Add some protologs for window organizers & shell
- Refactor out base protolog impl so that shell can have it's own
  implementation which takes a different viewer config (from the resources
  directly instead of a separate file in /system/etc)
- Setup the protolog transform for shell classes
- Add some basic protologs for displayarea/task organizer controller
  & shell task org (for now only text logging)

Bug: 161980327
Test: adb shell wm logging enable-text WM_DEBUG_WINDOW_ORGANIZER
Test: adb shell dumpsys activity service SystemUIService WMShell enable-text-logging WM_SHELL_TASK_ORG
Test: atest ProtoLogImplTest \
            ProtoLogViewerConfigReaderTest \
            WmTests:ProtoLogIntegrationTest \
            LogDataTypeTest \
            protologtool-tests
Change-Id: I4c3fd6aaea04987c26ac56e9baf9fc8ab75a3f34
Signed-off-by: Winson Chung <winsonc@google.com>
2020-08-25 10:07:55 -07:00
Diego Vela
f58acf9e39 Convert logs to use protologs.
Migrate add remove debug log from debug config to protolog.
Migrate configuration debug log from debug config to protolog.
Update protolog file

Bug: 153162675
Test: manual
Change-Id: Ie97f77ce3fe165a9be2ff970da7e777962b0db31
2020-08-21 18:51:32 +00:00
Yan Zhu
bcae40d94b Move floatingcardslauncher code out of AOSP
Bug: 165034482
Test: build and flash
Change-Id: I7f5445f56deb432a41b497180f1a5285c0633ad7
2020-08-17 18:30:44 -07:00
Yan Zhu
abc6944b9a Merge "Update language to comply with Android's inclusive language guidance." 2020-08-17 20:39:52 +00:00
Fabian Kozynski
5d434a4a05 Merge "Add MODIFY_AUDIO_ROUTING permission to systemui" into rvc-qpr-dev am: d951edaa48 am: a7149e7a53
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12378082

Change-Id: Id9c81ccd72c10fa12b3972f466c6684fcf13c9ec
2020-08-17 19:13:17 +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
Yan Zhu
1cbe7726b0 Update language to comply with Android's inclusive language guidance.
See https://source.android.com/setup/contribute/respectful-code for

Bug: 162864134
Test: build and flash
Change-Id: Ia3febc38cfe55017aecc5e74e81b1bce0d70ceec
2020-08-14 20:40:23 +00:00
Agatha Man
443decbb58 Merge "Remove car permissions from common shell package" into rvc-qpr-dev am: d029933aa5
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12330563

Change-Id: I559c3cd33280083f88f4d9f7f2324153e49527ce
2020-08-14 18:51:55 +00:00
Agatha Man
39bcfc7c83 Remove car permissions from common shell package
Removing car permissions that were added into common shell so that they
can be re-evaulated to include into CarShell. Adding car permissions to
shell should be reviewed by car frameworks team to determine what can be
allowed to the end-user and in terms of car safety.

Bug: 160339243
Test: make then check permission for shell user with adb shell pm dump
com.android.shell

Change-Id: I5a3b2086f605ba31f4231ec425cb2cb7c51ea7e6
(cherry picked from commit 89e5cfe9d8)
Merged-In: I5a3b2086f605ba31f4231ec425cb2cb7c51ea7e6
2020-08-14 18:44:14 +00:00
Fabian Kozynski
5f617413aa Add MODIFY_AUDIO_ROUTING permission to systemui
Adds the privileged permission for AppOpsControllerImpl.

Test: build and record
Fixes: 164213112
Change-Id: Ib23749542bb41eb1df2fb7cfe62db57fba73d0cf
2020-08-14 11:40:29 -04:00
Treehugger Robot
28e91a4c38 Merge "Add KEYCODE_PROG_{BLUE,RED,GREEN,YELLOW} mappings to LKC equivalents" am: 4ec7604b48 am: ab5d157062 am: 2db2e500ee am: c7b8432e5a am: ff5bde9751
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1388616

Change-Id: I6bb98e89c5e32a42d81e5e4e63746edd3fc4788c
2020-08-07 18:07:15 +00:00
Treehugger Robot
ff5bde9751 Merge "Add KEYCODE_PROG_{BLUE,RED,GREEN,YELLOW} mappings to LKC equivalents" am: 4ec7604b48 am: ab5d157062 am: 2db2e500ee am: c7b8432e5a
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1388616

Change-Id: I82e0b5bd6030b1ca0833bfbe7a684747370ca633
2020-08-07 17:49:44 +00:00
Treehugger Robot
c7b8432e5a Merge "Add KEYCODE_PROG_{BLUE,RED,GREEN,YELLOW} mappings to LKC equivalents" am: 4ec7604b48 am: ab5d157062 am: 2db2e500ee
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1388616

Change-Id: I21b9567bf11eda9a678f4b6e2549d8297f395bd9
2020-08-07 17:33:04 +00:00
Treehugger Robot
2db2e500ee Merge "Add KEYCODE_PROG_{BLUE,RED,GREEN,YELLOW} mappings to LKC equivalents" am: 4ec7604b48 am: ab5d157062
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1388616

Change-Id: I31d939fbb443e76fc912dfe663d0b5a060ecba22
2020-08-07 17:31:17 +00:00
Treehugger Robot
4ec7604b48 Merge "Add KEYCODE_PROG_{BLUE,RED,GREEN,YELLOW} mappings to LKC equivalents" 2020-08-07 16:54:11 +00:00
TreeHugger Robot
525571fa77 Merge "Allow permission controller to read audio configuration" into rvc-qpr-dev am: b7e594e9f1 am: 1410b4a395
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12308439

Change-Id: I2d0d169dd892081ff22edb5bd90219f47ff66321
2020-08-06 23:52:36 +00:00
TreeHugger Robot
1410b4a395 Merge "Allow permission controller to read audio configuration" into rvc-qpr-dev am: b7e594e9f1
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12308439

Change-Id: I86aecf16784baf432aecd60f3a35f818d8ad9734
2020-08-06 23:50:59 +00:00
Aman Gupta
7395b0a265 Add KEYCODE_PROG_{BLUE,RED,GREEN,YELLOW} mappings to LKC equivalents
My goal is to allow colored keys on HDMI-CEC and Bluetooth remotes to be used by an Android TV app.

The USB HID spec [1] and CEC spec [2] both define distinct codes for these keys.

The kernel converts both the HID [4] and CEC [5] codes to standard LKC codes [6]:

  #define KEY_RED		0x18e
  #define KEY_GREEN		0x18f
  #define KEY_YELLOW	0x190
  #define KEY_BLUE		0x191

Android also defines KEYCODE_PROG_ constants for these keys in KeyEvent.java [3]. This commit maps these LKC codes starting at 0x18e (i.e 398) to the existing KeyEvent equivalents.

[1] https://www.usb.org/sites/default/files/color_buttons_0.pdf
[2] https://github.com/floe/CEC/raw/master/extras/CEC_Specs.pdf
[3] https://github.com/aosp-mirror/platform_frameworks_base/blob/master/core/java/android/view/KeyEvent.java#L539-L550
[4] https://github.com/torvalds/linux/blob/master/drivers/hid/hid-input.c#L897-L900
[5] https://github.com/torvalds/linux/blob/master/drivers/media/rc/keymaps/rc-cec.c#L142-L145
[6] https://github.com/torvalds/linux/blob/master/include/uapi/linux/input-event-codes.h#L470-L473

Signed-off-by: Aman Gupta <aman@tmm1.net>
Change-Id: I26c63732c8533390de91460acec312fd27ad8866
2020-08-06 08:03:19 -07:00
Philip P. Moltmann
f379917d3e Allow permission controller to read audio configuration
- Unfortunately there is no read-only permission that allows to read the
audio configuration
- Unfortunately there is no API bump before the feature ships that would
allow us to add such a read-only permission

Bug: 162547999
Test: Read audio configuration from permission controller
Change-Id: Icfe2b5ae54cae1cfc1be44a1370ffb0692365316
2020-08-05 02:40:55 +00:00
Agatha Man
89e5cfe9d8 Remove car permissions from common shell package
Removing car permissions that were added into common shell so that they
can be re-evaulated to include into CarShell. Adding car permissions to
shell should be reviewed by car frameworks team to determine what can be
allowed to the end-user and in terms of car safety.

Bug: 160339243
Test: make then check permission for shell user with adb shell pm dump
com.android.shell

Change-Id: I5a3b2086f605ba31f4231ec425cb2cb7c51ea7e6
2020-08-04 16:25:48 -07:00
Automerger Merge Worker
e4177f5cb4 Merge "Merge "Add KEYCODE_MEDIA_AUDIO_TRACK mapping to USB HID Usage consumer page (0x0c/0x173) "Alternate Audio Increment"" am: 21e6488ae7 am: ecd346e431 am: 6b96fe8128 am: 67236850f5" into rvc-qpr-dev-plus-aosp am: 34c6c66153
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1365554

Change-Id: I40b85269a1f0c9ae065b12a7842d3be1e7c9b0f4
2020-08-03 22:31:36 +00:00
Siarhei Vishniakou
d6a3193071 Merge "Add KEYCODE_MEDIA_AUDIO_TRACK mapping to USB HID Usage consumer page (0x0c/0x173) "Alternate Audio Increment"" am: 21e6488ae7 am: ecd346e431 am: 6b96fe8128 am: 67236850f5
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1365554

Change-Id: Ia52fbe23826565f4fa785a1b52a4d1196a516b6f
2020-08-03 22:27:56 +00:00
Siarhei Vishniakou
67236850f5 Merge "Add KEYCODE_MEDIA_AUDIO_TRACK mapping to USB HID Usage consumer page (0x0c/0x173) "Alternate Audio Increment"" am: 21e6488ae7 am: ecd346e431 am: 6b96fe8128
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1365554

Change-Id: I20ccd5483de1903f7330b36c00ead5be788cc201
2020-08-03 22:26:30 +00:00
Siarhei Vishniakou
6b96fe8128 Merge "Add KEYCODE_MEDIA_AUDIO_TRACK mapping to USB HID Usage consumer page (0x0c/0x173) "Alternate Audio Increment"" am: 21e6488ae7 am: ecd346e431
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1365554

Change-Id: Ib727f09a3426172ac789f0a2e5bab06491e7b002
2020-08-03 22:12:22 +00:00
Siarhei Vishniakou
21e6488ae7 Merge "Add KEYCODE_MEDIA_AUDIO_TRACK mapping to USB HID Usage consumer page (0x0c/0x173) "Alternate Audio Increment"" 2020-08-03 21:29:08 +00:00
Treehugger Robot
abc8502551 Merge "Add support for Razer Kishi game controller." am: dab3aaa5c6 am: d13c410dfa am: b2ccd88b3f am: 85ec9950e2
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1384139

Change-Id: I1914d2712aa5802ca212f05b41954a61b84c1256
2020-08-01 13:45:59 +00:00
Treehugger Robot
85ec9950e2 Merge "Add support for Razer Kishi game controller." am: dab3aaa5c6 am: d13c410dfa am: b2ccd88b3f
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1384139

Change-Id: I78d0dded98f00114e90fb5b8fe6b054becccba95
2020-08-01 13:21:45 +00:00
Treehugger Robot
b2ccd88b3f Merge "Add support for Razer Kishi game controller." am: dab3aaa5c6 am: d13c410dfa
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1384139

Change-Id: I5e5ce4f05763347ebe7e1cd5dd80be82489d436c
2020-08-01 13:08:10 +00:00
Treehugger Robot
dab3aaa5c6 Merge "Add support for Razer Kishi game controller." 2020-08-01 12:29:58 +00:00
Treehugger Robot
696d25e48c Merge "Add support for Scuf Vantage game controller." am: 8ee49446ef am: 8114f3607b am: 889b8deaed am: eac0d11024
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1384181

Change-Id: Iab006565a19056c04d00669fc84b15886d2ee480
2020-08-01 05:51:46 +00:00
Treehugger Robot
eac0d11024 Merge "Add support for Scuf Vantage game controller." am: 8ee49446ef am: 8114f3607b am: 889b8deaed
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1384181

Change-Id: Id998230b0cdec0b201c540d6d09f0a755b2b1702
2020-08-01 05:32:17 +00:00
Treehugger Robot
889b8deaed Merge "Add support for Scuf Vantage game controller." am: 8ee49446ef am: 8114f3607b
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1384181

Change-Id: If5954b0ae3ab98a10ee89b871e5ebfe9be5d3953
2020-08-01 05:19:46 +00:00
Chris Ye
d91a29ac36 Add support for Razer Kishi game controller.
Add Razer Raiju Kishi controller keyboard layout mapping.

Bug: 140958486
Test: Connect Razer Kishi controller and play game with it.
Change-Id: I6f94e212fe10f777f04ad9815468e2148d4252f5
Merged-In: I6f94e212fe10f777f04ad9815468e2148d4252f5
2020-08-01 04:38:14 +00:00
Chris Ye
b07e2f8093 Add support for Scuf Vantage game controller.
Add Scuf Vantage controller keyboard layout mapping.

Bug: 155223457
Test: ControllerTest App, Connect Scuf Vantage controller and play game with it.
Change-Id: I21d23dcbeb4ef24d212d4e386f6dbf8b1b89d9f6
Merged-In: I21d23dcbeb4ef24d212d4e386f6dbf8b1b89d9f6
2020-08-01 04:35:51 +00:00
TreeHugger Robot
d5bb2767e8 Merge "Add key layout for 8BitDo SN30 Pro gamepad" 2020-07-31 21:50:22 +00:00
Ricardo Quesada
dc7e9941d2 Add key layout for 8BitDo SN30 Pro gamepad
This CL adds Key Layout file for the 8BitDo SN30 Pro gamepad.
The 8BitDo SN30 gamepad has 4 layout modes:
  - Switch
  - Android (AKA D-Input)
  - Windows (AKA X-Input)
  - macOS

Switch, Windows and macOS modes are already covered by the Switch, Xbox
and DS4 key layout files. This CL adds the remaining mode.

Bug: 162043910
Test: Manually tested by launching Gamepad Tester APK and verifying that
      all the mappings are correct.
Change-Id: I41688c64188c0705d0286744a8f76a9268feca25
2020-07-31 12:20:58 -07:00
Agatha Man
021baba49e Merge "Add CAR_DIAGNOSTICS, CLEAR_CAR_DIAGNOSTICS, CONTROL_APP_BLOCKING, and CAR_UX_RESTRICTIONS_CONFIGURATION permissions to run ATS tests" into rvc-qpr-dev am: 77d8407cb0 am: 95fa0c3ffd
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12225177

Change-Id: I2dfd6398ea992ea9ebce203efc45ae1693711a6a
2020-07-27 21:40:03 +00:00
Agatha Man
95fa0c3ffd Merge "Add CAR_DIAGNOSTICS, CLEAR_CAR_DIAGNOSTICS, CONTROL_APP_BLOCKING, and CAR_UX_RESTRICTIONS_CONFIGURATION permissions to run ATS tests" into rvc-qpr-dev am: 77d8407cb0
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12225177

Change-Id: I8b331318c9893180ecae96ddfe0447a767faa759
2020-07-27 21:23:19 +00:00
Agatha Man
77d8407cb0 Merge "Add CAR_DIAGNOSTICS, CLEAR_CAR_DIAGNOSTICS, CONTROL_APP_BLOCKING, and CAR_UX_RESTRICTIONS_CONFIGURATION permissions to run ATS tests" into rvc-qpr-dev 2020-07-27 21:09:41 +00:00
Agatha Man
5c17bba24d Add CAR_DIAGNOSTICS, CLEAR_CAR_DIAGNOSTICS, CONTROL_APP_BLOCKING,
and CAR_UX_RESTRICTIONS_CONFIGURATION permissions to run ATS tests

CarDeviceInfo requires CAR_DIAGNOSTICS, CLEAR_CAR_DIAGNOSTICS.
AtsCarHostTestCases requires CONTROL_APP_BLOCKING and
CAR_UX_RESTRICTIONS_CONFIGURATION.

Note: This change allows anyone with a usb cable to write an app
to call the protected APIs in her/his car.

Bug: 162120802
Test: make
Change-Id: I9d0e1266389170cca3624522820457e826bbc613
2020-07-27 21:03:15 +00:00
Treehugger Robot
4a454ebffb Merge "Add KEYCODE_WINDOW mapping to USB HID Usage consumer page (0x0c/0x67) "Picture-in-Picture Toggle"" am: 85a6580f09 am: aa0cee06b1 am: ab368be7ad am: 9a1b33f61f am: f34f7b6afb
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1365553

Change-Id: Icb6afd203bcea6139f0cf1f48cb064c3b0847869
2020-07-25 02:18:45 +00:00
Treehugger Robot
f34f7b6afb Merge "Add KEYCODE_WINDOW mapping to USB HID Usage consumer page (0x0c/0x67) "Picture-in-Picture Toggle"" am: 85a6580f09 am: aa0cee06b1 am: ab368be7ad am: 9a1b33f61f
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1365553

Change-Id: I777031db5e4468fccdbc7bf96e8b48fdd8a30fb0
2020-07-25 02:02:37 +00:00
Treehugger Robot
9a1b33f61f Merge "Add KEYCODE_WINDOW mapping to USB HID Usage consumer page (0x0c/0x67) "Picture-in-Picture Toggle"" am: 85a6580f09 am: aa0cee06b1 am: ab368be7ad
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1365553

Change-Id: I68d4ba8f821a24219b02a026bffcb5676010ce84
2020-07-25 01:46:25 +00:00
Treehugger Robot
ab368be7ad Merge "Add KEYCODE_WINDOW mapping to USB HID Usage consumer page (0x0c/0x67) "Picture-in-Picture Toggle"" am: 85a6580f09 am: aa0cee06b1
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1365553

Change-Id: I2cc60fb80d146a2121d0c5cba79e83581f281816
2020-07-25 01:28:24 +00:00
TreeHugger Robot
490f35034e Merge "Remove references to system-user-whitelisted-app" 2020-07-24 16:37:04 +00:00
TreeHugger Robot
0b66db6ce3 Merge "Add support for Scuf Vantage game controller." 2020-07-23 18:31:05 +00:00
Fabian Kozynski
974eefa779 Merge changes from topic "permission_chip" into rvc-qpr-dev am: 9a85dc9c0a
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12130778

Change-Id: I9405dd5653d5ea99ba998ab30e211494aef5ce21
2020-07-23 14:06:06 +00:00
Fabian Kozynski
9a85dc9c0a Merge changes from topic "permission_chip" into rvc-qpr-dev
* changes:
  Restricts notified app ops based on flags
  Add back privacy chip
2020-07-23 13:45:26 +00:00