Commit Graph

1167 Commits

Author SHA1 Message Date
Neil Fuller
7e11d634fc Merge "Add a new permission in AOSP" am: 4b22e7c281 am: 1f728acac0 am: 8a0ce64177 am: 75ae324fb9 am: 7a3481c35c
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1440636

Change-Id: I3a2b428be82d029c3cb7c8fa9b3102dd62eec8dc
2020-09-30 10:30:38 +00:00
Neil Fuller
8a0ce64177 Merge "Add a new permission in AOSP" am: 4b22e7c281 am: 1f728acac0
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1440636

Change-Id: I2a65d7c9a91f5b3f5772ba8b2b199bfe3096077b
2020-09-30 09:35:03 +00:00
Neil Fuller
770f5ab2db Add a new permission in AOSP
This adds a new permission in AOSP, so it can be referenced by the Shell
command, which presubmit suggests has to be maintained in AOSP.

Bug: 159891384
Test: build only
Exempt-From-Owner-Approval: jsharkey@ approved but it appears to have reset...?
Change-Id: Ic7d403e20731e9d6bd82d5b2e2758cc61989cc59
2020-09-30 08:39:25 +00:00
Treehugger Robot
ee6cd5fc5b Merge "Update language to comply with Android's inclusive language guidance" am: 986e49df72 am: 21e5a00fb3 am: bc3cef1dce am: 91d640572f am: 58ebc4f303
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1382481

Change-Id: I23744e158143a09d887e0ff1de912f687ffd0ded
2020-09-28 16:12:12 +00:00
Treehugger Robot
bc3cef1dce Merge "Update language to comply with Android's inclusive language guidance" am: 986e49df72 am: 21e5a00fb3
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1382481

Change-Id: Ia71942419b1b736f06875ff87a348d952f74dd7b
2020-09-28 15:15:40 +00:00
Treehugger Robot
986e49df72 Merge "Update language to comply with Android's inclusive language guidance" 2020-09-28 14:11:49 +00:00
Marin Shalamanov
794938dfa7 Merge "Add permission to override display mode requests" am: 7fb5deb779 am: 83a8725d55
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1420968

Change-Id: I59da44847b84fc262248409dbe8e49c608743886
2020-09-21 13:01:37 +00:00
Marin Shalamanov
7fb5deb779 Merge "Add permission to override display mode requests" 2020-09-21 12:23:13 +00:00
Marin Shalamanov
8f2f6d1465 Add permission to override display mode requests
This permission will be used for testing purposes
to override the display mode requests in DisplayModeDirector.

Bug: 159113268
Bug: 158316271
Test: m
Change-Id: Ibcafc50badcda929c3c3b446b6d0d9045c2a5b6d
Merged-In: I257636ae2a6ed74044e71e49a99024682c3a92c5
2020-09-21 14:04:48 +02:00
Marin Shalamanov
97ba024fb0 Add TestApi to always select the app requested display mode
The added test API is used to ignore all votes in
DisplayModeDirector app votes. This way only the app
requested display mode will be picked. The API will be
used for testing app mode switch requests.

Bug: 159113268
Bug: 158316271
Test: m
Change-Id: I257636ae2a6ed74044e71e49a99024682c3a92c5
2020-09-18 13:32:54 +02:00
Bill Yi
5b49c68d11 Merge mainline-release 6664920 to master - DO NOT MERGE
Merged-In: Id04ea331831e8b26ba99478848392b40a92548d5
Change-Id: I888da0c9475f2d00602d917d2f58169f8d7c93a4
2020-09-17 21:56:59 -07:00
Sergey Nikolaienkov
35c1bb7cf7 Merge "Add GET_INTENT_SENDER_INTENT permission to Shell" am: 104d2f92b3 am: ec82033d3e am: 4bf2a8e322 am: d851ed5dde am: 541541b868
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1385856

Change-Id: I281b6085d164227cfa4fee46ab90d3c167416639
2020-09-09 08:57:39 +00:00
Sergey Nikolaienkov
4bf2a8e322 Merge "Add GET_INTENT_SENDER_INTENT permission to Shell" am: 104d2f92b3 am: ec82033d3e
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1385856

Change-Id: I3a835c92cf86985d6861382f33c58d5df000f2d7
2020-09-09 07:57:43 +00:00
Sergey Nikolaienkov
ec82033d3e Merge "Add GET_INTENT_SENDER_INTENT permission to Shell" am: 104d2f92b3
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1385856

Change-Id: Ice3e441cc9c0df8d0a6acc016bb74375e081bd67
2020-09-09 07:23:52 +00:00
Sergey Nikolaienkov
104d2f92b3 Merge "Add GET_INTENT_SENDER_INTENT permission to Shell" 2020-09-09 07:09:11 +00:00
Bill Yi
7ffaf9920b Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Ie97ecf1dd2063063851b827c19f7d17c27e7a158
2020-09-04 21:58:37 +00:00
Bill Yi
1a29d74066 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I9bf56140e3ab788a4765fc80c4125f90796727a5
2020-09-03 04:54:48 +00:00
Xin Li
628590d7ec Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709)
Bug: 166295507
Merged-In: I3d92a6de21a938f6b352ec26dc23420c0fe02b27
Change-Id: Ifdb80563ef042738778ebb8a7581a97c4e3d96e2
2020-08-31 21:21:38 -07: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
Chavi Weingarten
2da90f7972 Merge "Remove rotation and use flag useIdentityTransform for screenshots." 2020-08-10 18:33:25 +00:00
chaviw
ca2eb0182f Remove rotation and use flag useIdentityTransform for screenshots.
There's a lot of confusing logic where 90 and 270 rotation values need
to be flipped to ensure the screenshot is taken the correct orientation.
There's also confusion what useIdentityTransform means, especially if a
non 0 rotation value is sent.

The cases screenshot cares about is the following:
1. Take screenshot in current display orientation
2. Take screenshot with 0 rotation so the caller can handle rotating the
screenshot themselves.

With these two cases in mind, remove the rotation value passed in for
screenshots. If useIdentityTransform is true, it will rotate the
screenshot so it's in the 0 orientation. If useIdentityTransform is
false, it will use the current display rotation.

This simplifies the caller logic since they no longer have to find the
current display rotation to ensure the screenshot is taken in the
current rotation. The callers can just request the screenshot with
useIdentityTransform set to false.

Test: adb shell screencap
Test: Power + volume screenshot
Test: Screen rotation
Fixes: 135942984
Change-Id: I3435ee8b5dac05e910ec1e695f398c5dcdcff9e9
2020-08-06 11:30:59 -07: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
Alice Kuo
5c75720453 Update language to comply with Android's inclusive language guidance
See https://source.android.com/setup/contribute/respectful-code for reference

 #inclusivefixit

Bug: 162536543
Change-Id: I468147a439c1a60488def7db3e44bfc361bddbe4
2020-08-03 15:42:39 +00: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
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
a5a04bbb4e Merge "Adding LOADER_USAGE_STATS permission to shell" 2020-07-23 22:45:36 +00:00
Sergey Nikolaienkov
75225cf509 Merge "Make Shell require permission for a new CTS test" am: e3548b2259 am: f453a23f6a am: 71f8e0fbc2 am: 8c68c6cc7b am: f845890a60
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1356702

Change-Id: I2fc172a38db467edeb796fd6c3eaa99023ecd761
2020-07-22 07:31:02 +00:00
Sergey Nikolaienkov
f845890a60 Merge "Make Shell require permission for a new CTS test" am: e3548b2259 am: f453a23f6a am: 71f8e0fbc2 am: 8c68c6cc7b
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1356702

Change-Id: I2781346318531c2e0ada296644786bda3cafbf73
2020-07-22 07:16:56 +00:00
Sergey Nikolaienkov
71f8e0fbc2 Merge "Make Shell require permission for a new CTS test" am: e3548b2259 am: f453a23f6a
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1356702

Change-Id: Id65701e738cd523032166eb48e1aba052f55defa
2020-07-22 06:51:45 +00:00
Bill Yi
a7722bb10f Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Id55a4dbbd1ed24f9274ee4c2ba1b7c076b6f936d
2020-07-19 08:13:53 -07:00
Agatha Man
7be384568b Add CAR_DRIVING_STATE and CAR_CONTROL_AUDIO_VOLUME permissions to run am: 39ba8c9cc3 am: 2f457b142d
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12142737

Change-Id: Ib70d1bf25b6c31b5ee8d62914fe94d89f93f391f
2020-07-17 17:57:58 +00: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
Nikolas Havrikov
74941c20ed Make Shell require permission for a new CTS test
The permission RESET_APP_ERRORS is required for UnsupportedErrorDialogTests

Bug: 159443507
Test: built locally
Change-Id: I4d110278eb48799caf29f0582536a4dca10f10c1
2020-07-08 12:09:27 +00:00
Joshua Duong
2efd751980 Merge changes from topic "adbwifi-cts" into rvc-dev am: 5ab3aa0c7b am: af1f67ebd4 am: b497b40119 am: ee288b5c36
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12000446

Change-Id: I938c0abdf21c197f19f7b89cf8388a86827d615e
2020-06-30 02:03:45 +00:00
Joshua Duong
ee288b5c36 Merge changes from topic "adbwifi-cts" into rvc-dev am: 5ab3aa0c7b am: af1f67ebd4 am: b497b40119
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12000446

Change-Id: I1124248048dd778f02cab0945c52b74fa48a8712
2020-06-30 01:23:15 +00:00
Joshua Duong
b497b40119 Merge changes from topic "adbwifi-cts" into rvc-dev am: 5ab3aa0c7b am: af1f67ebd4
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12000446

Change-Id: I56de8c996bccc8c926547afdc322c36d381f557b
2020-06-30 01:09:39 +00:00
Joshua Duong
265b25bfe4 Merge changes from topic "adbwifi-cts" into rvc-dev am: 5ab3aa0c7b
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12000446

Change-Id: I7e0ecc743d2e831f208865df3604c5f7a3fa8820
2020-06-30 00:57:47 +00:00
Joshua Duong
b47d1e6100 Merge changes from topic "adbwifi-cts" into rvc-dev am: 5ab3aa0c7b
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12000446

Change-Id: I27c6493f075ace2e9c12f9b7f359f42ccbb1406f
2020-06-30 00:57:37 +00:00
Joshua Duong
f2e03b393f Add shell permissions for CTS test (AdbManagerTest).
Bug: 159936209

Test: atest CtsAdbManagerTests
Change-Id: I896b53df582cceb7d1b0d6694d00064b0fb57b94
2020-06-25 15:03:19 -07:00
Dieter Hsu
848113e595 Enable bug report tests in pre/postsubmit
Bug: 155604488
Test: atest --test-mapping --dry-run \
          services/core/java/com/android/server/os:presubmit
Test: atest --test-mapping --dry-run core/java/android/os:presubmit
Change-Id: I054d05d4fa8ff02f1c404d0883c382a2d5911f88
2020-06-24 12:20:32 +08:00
TreeHugger Robot
1704c68e8a Merge "Import translations. DO NOT MERGE" 2020-06-20 06:56:44 +00:00
Bill Yi
5b8db946b4 Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Change-Id: I676163f17cc11f1c0cf2a37b0d81a192ecae7af3
2020-06-20 02:43:41 +00:00
Nathan Harold
463bb8caf6 Merge "Allow Background Location Access for Shell" into rvc-dev am: 811cf5d8f5 am: c1197612dd am: a7c90af06a am: 5c077660b2
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11914608

Change-Id: I6a3b8c8e6212d27ab6801f95ba6018be4f739e44
2020-06-19 19:42:32 +00:00
Nathan Harold
f543091ab8 Merge "Allow Background Location Access for Shell" into rvc-dev am: 811cf5d8f5 am: 86013d505f
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11914608

Change-Id: Id715cf6426d157e3fc1bd036dead615afb3832e3
2020-06-19 19:17:05 +00:00
Nathan Harold
5a9fc5947c Merge "Allow Background Location Access for Shell" into rvc-dev am: 811cf5d8f5
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11914608

Change-Id: I1c21b4ac3d5c019047e50252df4e6e07def4add2
2020-06-19 19:05:37 +00:00
Nathan Harold
c1197612dd Merge "Allow Background Location Access for Shell" into rvc-dev am: 811cf5d8f5
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11914608

Change-Id: Ic22846e6f3337b2ebe7a6448829616a8a29056b3
2020-06-19 19:05:29 +00:00
Nathan Harold
1242fac1ae Allow Background Location Access for Shell
The shell has COARSE and FINE permission, but it
needs background access to support CTS test cases
that must be run with elevated permissions from
the shell.

Bug: 159236070
Test: atest PhoneStateListenerTest#testBarringInfo

Merged-In: Iba3fcb3a43c5df3c30dadf6b7733eaee03d1d0e3
Change-Id: Iba3fcb3a43c5df3c30dadf6b7733eaee03d1d0e3
(cherry picked from commit 89796d4936)
2020-06-19 09:09:37 -07:00
Nathan Harold
89796d4936 Allow Background Location Access for Shell
The shell has COARSE and FINE permission, but it
needs background access to support CTS test cases
that must be run with elevated permissions from
the shell.

Bug: 159236070
Test: atest PhoneStateListenerTest#testBarringInfo

Change-Id: Iba3fcb3a43c5df3c30dadf6b7733eaee03d1d0e3
2020-06-19 09:03:29 -07:00