Sergey Volnov
65aed0d0a4
Merge "Ensure updateState() is available for software hotword." into sc-dev
2021-04-21 08:25:41 +00:00
Treehugger Robot
a73bbaf2aa
Merge "Change Connectivity resources SDK version to 30" am: 60b1b70030
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1679749
Change-Id: I0ef9286794a6013b50fb1dfd0b59d35a5ae55c20
2021-04-21 08:25:39 +00:00
Treehugger Robot
aaf353b24c
Merge "Add the related extra information in the javadoc"
2021-04-21 08:22:43 +00:00
TreeHugger Robot
ca0506fce7
Merge "Update docs to reflect LE batch scan report delay floor" into sc-dev
2021-04-21 08:11:54 +00:00
Bill Yi
142bf3591f
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9bd53e3ed5 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14260293
Change-Id: Ib1481d155ec4880b7f19839a7b333882711b44b0
2021-04-21 08:06:45 +00:00
Svet Ganov
8b1aad623e
Pipe start op throught app ops policy and delegate
...
bug: 185504196
Test: atest CtsAppOpsTestCases
atest CtsPermissionTestCases
atest CtsPermission2TestCases
atest CtsPermission3TestCases
atest CtsPermission4TestCases
atest CtsPermission5TestCases
Change-Id: I5869a3e9719830f59624519f2d54f0765119cf5f
2021-04-21 08:06:35 +00:00
Bill Yi
37ed9af2bf
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c8a5869561 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14260509
Change-Id: Ie9aaa31fc0dcc4c13c2849fbf0c2424824338b40
2021-04-21 08:04:57 +00:00
Treehugger Robot
60b1b70030
Merge "Change Connectivity resources SDK version to 30"
2021-04-21 08:00:41 +00:00
mincheli
d51edde5d2
Magnification uses WindowManager.getMaximumWindiowMetrics to compute its layout instead of the display size
...
Bug: 185099320
Test: atest WindowMagnificationController
Change-Id: I764fb870aa18980c07b08dacdaf56bcd598ff2ab
2021-04-21 07:40:40 +00:00
Pinyao Ting
d9b11089e7
Merge "Implement Device Flag for shortcut integration with AppSearch" into sc-dev
2021-04-21 07:24:42 +00:00
Bill Yi
c8a5869561
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I4f7484a0a0bf93d6677ed726ec412a7cc7959b1d
2021-04-21 06:35:12 +00:00
Bill Yi
9bd53e3ed5
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I96f001190ba994e7e181a939a70665eaeda16f98
2021-04-21 06:31:48 +00:00
Joanne Chung
e847921bea
Update javadoc for ViewTranslationRequest.Builder for virtual view.
...
Bug: 185273314
Test: n/a. Only update javadoc.
Change-Id: I63b0115184113b1a85833408a61859b7c3d55713
2021-04-21 14:19:18 +08:00
Joy Babafemi
49511145e9
UWB: Add setUwbEnabled System API.
...
Test: Test updated for AdapterStateListener.java
Bug: 183254940
Change-Id: I269d24c995d8064f8e62c80a1566fa0646e96580
2021-04-21 05:55:58 +00:00
TreeHugger Robot
1027fb5c21
Merge "Fix oneway error on IUwbRangingCallbacks calls" into sc-dev
2021-04-21 05:47:36 +00:00
Rob Carr
79f15c60f3
Merge "SurfaceControl: Fix builder" into sc-dev
2021-04-21 05:22:27 +00:00
TreeHugger Robot
3318dbf7bb
Merge "Flag-gate immersive mode indicator" into sc-dev
2021-04-21 05:16:19 +00:00
Zoey Chen
aa3c222643
[ANAPIC Review] Change the type of List by ANAPIC review
...
- Use List<Byte> since using uint8_t in radio
Bug: 183738486
Test: make
Change-Id: I5a52bc20ebd9c5ce000abd8588f2969d84c6bcd0
Merged-In: I5a52bc20ebd9c5ce000abd8588f2969d84c6bcd0
2021-04-21 05:12:28 +00:00
TreeHugger Robot
a212d74f3e
Merge "Refactor Telephony phone number access checks to LegacyPermissionMgr" into sc-dev
2021-04-21 04:37:41 +00:00
Lucas Dupin
fe06390a3c
Clamp ink color alpha
...
On the old version of the ripple, the alpha is limited to 50%, we should
also do the same on the latest designs.
Bug: 184165556
Test: manual
Change-Id: Iec14394e0a0bca00283a713a409dd0794eb6fb9a
2021-04-20 21:36:37 -07:00
Tianjie Xu
ff38f2041d
Merge "Catch security exceptions in RoR APIs" am: 27dcfb808c am: ffbcac67ab am: f14cfe0fc3
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1651270
Change-Id: I966f41db7056be4452050f4a5a8f512f9974f790
2021-04-21 04:35:48 +00:00
Benedict Wong
b8012043e1
Merge "Fix NPE in dump and add additional dump data" am: 36478cfdaa am: 3bad1d413e am: a5f342853b
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1682045
Change-Id: Id59d0bab5db74c9de6c956457072589b16bdcb36
2021-04-21 04:35:19 +00:00
Tianjie Xu
f14cfe0fc3
Merge "Catch security exceptions in RoR APIs" am: 27dcfb808c am: ffbcac67ab
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1651270
Change-Id: I034655978c746b2e824ab27d68d4fb5316aa1b3b
2021-04-21 04:06:56 +00:00
Benedict Wong
a5f342853b
Merge "Fix NPE in dump and add additional dump data" am: 36478cfdaa am: 3bad1d413e
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1682045
Change-Id: Iaa9a7094b4276e40849ad6eb58860176656eef16
2021-04-21 04:06:44 +00:00
Riddle Hsu
bb1a4ad2b0
Merge "Verify that TaskOrganizer gets transferred launch cookie" into sc-dev
2021-04-21 04:04:17 +00:00
TreeHugger Robot
7a80f253ec
Merge "Smartspace - Fade out secondary cards" into sc-dev
2021-04-21 03:54:02 +00:00
TreeHugger Robot
0b4354de32
Merge "Revert "Update user profiles on user unavailable"" into sc-dev
2021-04-21 03:38:06 +00:00
TreeHugger Robot
7b8cdbf081
Merge "Move FrameworksServicesTests to group presubmit-large" into sc-dev
2021-04-21 03:38:01 +00:00
Tianjie Xu
ffbcac67ab
Merge "Catch security exceptions in RoR APIs" am: 27dcfb808c
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1651270
Change-Id: I4f06dc0b0dc5ae9ba252251f25b7a63cee0909ec
2021-04-21 03:34:25 +00:00
Benedict Wong
3bad1d413e
Merge "Fix NPE in dump and add additional dump data" am: 36478cfdaa
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1682045
Change-Id: I0542725ae7f4402c1940848b299ee6eac945bae6
2021-04-21 03:29:42 +00:00
Tianjie Xu
27dcfb808c
Merge "Catch security exceptions in RoR APIs"
2021-04-21 03:22:56 +00:00
Peter Li
993e1907a6
Merge "Change API names and constants by API review" into sc-dev
2021-04-21 03:20:56 +00:00
James Mattis
772afb9b20
Merge "Correctly count nri uid request counts" am: 1b7a5e282c am: 0c8d65b489 am: 8bc9d3464c
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1655051
Change-Id: Ibec1f37f2062827cf390eb344dd30447bdabec13
2021-04-21 03:17:13 +00:00
Treehugger Robot
26869310e5
[automerger skipped] Merge "Adding a permission to Shell for testing" am: 7342dafaa5 am: 23f9ef4d2b am: fd03622048 -s ours
...
am skip reason: skip tag Change-Id Ia0f8afa6dc1a13c95553b691f352c6d8c7ae5ccf with SHA-1 b0db699780 is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1679721
Change-Id: I80c586492f04250f71a9534f167d5e1245687a73
2021-04-21 03:16:46 +00:00
Chris Li
a3e28dec2c
Merge "Fix flaky legacy split screen flicker tests" into sc-dev
2021-04-21 03:07:15 +00:00
Benedict Wong
36478cfdaa
Merge "Fix NPE in dump and add additional dump data"
2021-04-21 03:04:53 +00:00
Dmitri Plotnikov
2da1afff2e
Fix BatteryStatsViewer makefile...
...
to allow BatteryStatsViewer to be included in the system build.
Also, setting the launcher icon to match other similar test apps.
Bug: 185952656
Test: include BSV in device.mk, build and flash
Change-Id: I4d0216418dd30b54adb20d88ac121a09e82350a4
2021-04-20 19:57:21 -07:00
James Mattis
8bc9d3464c
Merge "Correctly count nri uid request counts" am: 1b7a5e282c am: 0c8d65b489
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1655051
Change-Id: If4ff10a4793cee3a00aa1d66bf85af19f9e88b72
2021-04-21 02:52:41 +00:00
Treehugger Robot
fd03622048
Merge "Adding a permission to Shell for testing" am: 7342dafaa5 am: 23f9ef4d2b
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1679721
Change-Id: I6f02958325c6c6a5f944bf4220338e950b7b0d10
2021-04-21 02:52:28 +00:00
lucaslin
8851bd8ee4
Add the related extra information in the javadoc
...
Bug: 185876442
Test: make docs
Change-Id: Ib0abc43e2009dbf5ee7b6c2a076424834d3d53f2
2021-04-21 10:43:15 +08:00
James Mattis
0c8d65b489
Merge "Correctly count nri uid request counts" am: 1b7a5e282c
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1655051
Change-Id: I5ab86516030c8758b77c7335da68fd4f01b34a60
2021-04-21 02:23:29 +00:00
Treehugger Robot
23f9ef4d2b
Merge "Adding a permission to Shell for testing" am: 7342dafaa5
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1679721
Change-Id: I8d412d08c63660956b282566ef3ecd09add58c12
2021-04-21 02:15:13 +00:00
James Mattis
1b7a5e282c
Merge "Correctly count nri uid request counts"
2021-04-21 02:06:33 +00:00
Kyunglyul Hyun
05df0a936c
Merge "Revert^2 "Change PlaybackState#isActiveState to isActive"" into sc-dev
2021-04-21 01:56:15 +00:00
Mat Bevilacqua
29ad8e6798
Fix oneway error on IUwbRangingCallbacks calls
...
Bug: 185948331
Test: atest android.uwb.cts.UwbManagerTest
Test: atest android.uwb
Change-Id: Ifd35f7cced39937c8e0766be6a1efde655c014fb
2021-04-20 18:55:09 -07:00
Treehugger Robot
7342dafaa5
Merge "Adding a permission to Shell for testing"
2021-04-21 01:49:34 +00:00
Hyundo Moon
013cf241a1
Merge changes from topic "system_mr2_media_content_control" into sc-dev
...
* changes:
System MediaRouter2: Resolve API review
Change MODIFY_AUDIO_ROUTING permission to MEDIA_CONTENT_CONTROL
2021-04-21 01:45:42 +00:00
Yanchao Su
2e2e479ef1
Merge "fix bug 184901520." into sc-dev
2021-04-21 01:44:08 +00:00
Nate Myren
449e217211
Flag-gate immersive mode indicator
...
Disable the immersive mode indicator unless the
enable_immersive_indicator device config flag is set
Bug: 185947709
Test: manual
Change-Id: Ief38fd7debad8291ddccdc8153fe6b1cdbcbc5ed
2021-04-20 18:40:59 -07:00
Arc Wang
b0ea152982
Merge "Fix UsageProgressBarPreference progress bug when zero total size" into sc-dev
2021-04-21 01:34:06 +00:00