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

1685 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
TreeHugger Robot
0368d814d6 Merge changes from topic "permission_hub_2_framework" into rvc-qpr-dev am: b7130b274c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12154741

Change-Id: Icdf461632e2104e05c5d3148ea4c0741ea4b1291
 2020-07-22 06:38:50 +00:00
TreeHugger Robot
b7130b274c Merge changes from topic "permission_hub_2_framework" into rvc-qpr-dev 
* changes:
  Give Permission Controller the ability to see all accounts.
  Allow perm controller to read historical app-op data
 2020-07-22 06:21:01 +00:00
Treehugger Robot
4ca19816c0 Merge "Add KEYCODE_CAPTIONS mapping to LKC KEY_SUBTITLE" am: 3e21dc8b70 am: 0796fa5254 am: 1c4d68f863 am: d8447c1fa6 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1365552

Change-Id: Ie1d8ec63a3672eada17843346805e7a3e4c7c531
 2020-07-21 22:10:51 +00:00
Treehugger Robot
d8447c1fa6 Merge "Add KEYCODE_CAPTIONS mapping to LKC KEY_SUBTITLE" am: 3e21dc8b70 am: 0796fa5254 am: 1c4d68f863 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1365552

Change-Id: I455e3070b6692cd45cf94053b2112c06b87eb2b0
 2020-07-21 21:53:28 +00:00
Treehugger Robot
1c4d68f863 Merge "Add KEYCODE_CAPTIONS mapping to LKC KEY_SUBTITLE" am: 3e21dc8b70 am: 0796fa5254 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1365552

Change-Id: I85a1b1a2f43df5cf78abc902abb0633fd97bf469
 2020-07-21 21:28:23 +00:00
Philip P. Moltmann
9abf24f032 Give Permission Controller the ability to see all accounts. 
Bug: 161007415
Change-Id: I912cbfdc9a1881a0e9a1755848147cdf23781885
 2020-07-21 20:38:37 +00:00
Aman Gupta
e30b82490c Add KEYCODE_MEDIA_AUDIO_TRACK mapping to USB HID Usage consumer page (0x0c/0x173) "Alternate Audio Increment" 
cc 20555cb645

Change-Id: I7ff8b71abd99e6024e874a0aac42e875720186f9
Signed-off-by: Aman Gupta <aman@tmm1.net>
 2020-07-21 12:12:40 -07:00
Aman Gupta
7b48e40231 Add KEYCODE_WINDOW mapping to USB HID Usage consumer page (0x0c/0x67) "Picture-in-Picture Toggle" 
cc https://www.usb.org/sites/default/files/ce_devices_0.pdf

Change-Id: Iac94535823fa0a97e1a926d28d6f7376c11b8bf0
Signed-off-by: Aman Gupta <aman@tmm1.net>
 2020-07-21 12:12:40 -07:00
Aman Gupta
6c984953ea Add KEYCODE_CAPTIONS mapping to LKC KEY_SUBTITLE 
From https://github.com/torvalds/linux/blob/master/include/uapi/linux/input-event-codes.h,
KEY_SUBTITLE is near the TV codes. Note that 0x172 == 370.

  #define KEY_CHANNEL		0x16b
  #define KEY_FAVORITES		0x16c
  #define KEY_EPG			0x16d
  #define KEY_PVR			0x16e	/* Media Select Home */
  #define KEY_MHP			0x16f
  #define KEY_LANGUAGE		0x170
  #define KEY_TITLE		0x171
  #define KEY_SUBTITLE		0x172
  #define KEY_ANGLE		0x173
  #define KEY_FULL_SCREEN		0x174	/* AC View Toggle */
  #define KEY_ZOOM		KEY_FULL_SCREEN

You can also see on https://www.kernel.org/doc/html/v4.9/media/uapi/rc/rc-tables.html it is listed in the "Movie play control" section:

  KEY_SUBTITLE	Allow changing the subtitle

Change-Id: I7690269cddd00b787a939f87ba651db38f1160ac
Signed-off-by: Aman Gupta <aman@tmm1.net>
 2020-07-21 12:09:52 -07:00
Treehugger Robot
3553c60737 Merge "Add KEYCODE_LAST_CHANNEL mapping to LKC KEY_LAST" am: 1710dbd097 am: c3fb05c1db am: 5dd5e5c937 am: 32f405be5d 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1365551

Change-Id: I74b751de02f78d9ec6801f5a1e0ba352d0ee005f
 2020-07-21 16:28:11 +00:00
Treehugger Robot
32f405be5d Merge "Add KEYCODE_LAST_CHANNEL mapping to LKC KEY_LAST" am: 1710dbd097 am: c3fb05c1db am: 5dd5e5c937 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1365551

Change-Id: Ib38af6404d351410af3c66e5c4bef97bc8f3cef3
 2020-07-21 16:08:11 +00:00
Treehugger Robot
5dd5e5c937 Merge "Add KEYCODE_LAST_CHANNEL mapping to LKC KEY_LAST" am: 1710dbd097 am: c3fb05c1db 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1365551

Change-Id: I6da0050ca6e1cf3907d4e19fefa391da1816641a
 2020-07-21 15:56:11 +00:00
Fabian Kozynski
fd89d72b13 Restricts notified app ops based on flags 
AppOps that are received by SystemUI and notified to listeners of
AppOpsControllerImpl are filtered based on the permission flag
PackageManager.FLAG_PERMISSION_USER_SENSITIVE_WHEN_GRANTED.

As calls to obtain this flag require an IPC, three things are done to
mitigate impact:
* PermissionFlagsCache keeps track of requested flags and will update
those (in a background thread), when a change is notified for a given
uid.
* Calls to getActiveAppOps/getActiveAppOpsForUser should be made from a
background thread.
* notifySubscribers is always called in the background thread.

Bug: 160966908
Test: atest PermissionFlagsCacheTest AppOpsControllerTest
Change-Id: I871094c32ce5ec940d779626333caa0ca500a4e3
Merged-In: I871094c32ce5ec940d779626333caa0ca500a4e3
 2020-07-20 16:02:19 -04:00
Agatha Man
2f457b142d Add CAR_DRIVING_STATE and CAR_CONTROL_AUDIO_VOLUME permissions to run am: 39ba8c9cc3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12142737

Change-Id: Iac1d2e3f7e4d0dbf93eaa86bfe4ccc7e26397be5
 2020-07-17 17:53:03 +00:00
Agatha Man
39ba8c9cc3 Add CAR_DRIVING_STATE and CAR_CONTROL_AUDIO_VOLUME permissions to run 
ATS tests

AtsCarHostTestCases and AtsCarDeviceApp requires CAR_DRIVING_STATE.
AtsDeviceInfo and AtsAudioDeviceTestCases requires
CAR_CONTROL_AUDIO_VOLUME.

Bug: 161193447
Test: m -j && run ats tests
Change-Id: Ib16c6c5e54b489479c872cfa826b055262b797bb
 2020-07-17 17:48:36 +00:00
Sarah Chin
11f538f963 Merge "Add HANDLE_CAR_MODE_CHANGED permission" into rvc-d1-dev am: 2047572941 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12173845

Change-Id: Id90b846a504d7160bf24cf0bb058fde2c0be0596
 2020-07-17 17:45:27 +00:00
Aman Gupta
48a06806f1 Add KEYCODE_LAST_CHANNEL mapping to LKC KEY_LAST 
Change-Id: Idcf987c6e5541e29cac1b8a89263580bfcdc9636
Signed-off-by: Aman Gupta <aman@tmm1.net>
 2020-07-16 18:27:02 -07:00