Andy Hung
05be3db5ae
Merge changes from topics "360RA channel mask", "audio channels" am: b1060eb9f5 am: d6c0a357ab am: c1b0ca6a32
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1669510
Change-Id: I94aa095ed5ba59acac76a59a46acca90dd383359
2021-04-21 01:28:31 +00:00
Remi NGUYEN VAN
4306458c29
Revert^2 "Remove framework-connectivity from the private API"
...
No target should build against hidden symbols in framework-connectivity,
as it has been moved to a mainline module that only exposes a stable
API.
Change-Id: I7e98314ce58419d3dce4845cba9c2b1852690c36
Fixes: 182859030
Test: m
2021-04-21 01:13:53 +00:00
TreeHugger Robot
d07ae7b445
Merge "Reroute surfaceflinger atoms through system server" into sc-dev
2021-04-21 01:11:20 +00:00
Remi NGUYEN VAN
36bae70378
Merge "Revert "Remove framework-connectivity from the private API"" into sc-dev
2021-04-21 01:08:54 +00:00
Remi NGUYEN VAN
fab0a766da
Revert "Remove framework-connectivity from the private API"
...
This reverts commit 17045d956fec23c96ae0681d2afa21aa991ea004.
Reason for revert: Broken build: b/185947883
Change-Id: Ia7e6af3b47540142b5ea511e825a9dc86c0680c6
2021-04-21 01:07:54 +00:00
Andy Hung
c1b0ca6a32
Merge changes from topics "360RA channel mask", "audio channels" am: b1060eb9f5 am: d6c0a357ab
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1669510
Change-Id: I2fbce01d6817edb9ea41284f38fe2fa09d5eea79
2021-04-21 01:03:54 +00:00
TreeHugger Robot
3723a67112
Merge changes I100846a4,I61b12a00 into sc-dev
...
* changes:
Revert "Added exposure effect on ImageWallpaper"
Revert "Stops ImageWallpaper Thread when phone is idle"
2021-04-21 00:57:50 +00:00
TreeHugger Robot
51f7357af1
Merge "Add back deprecated Translator.translate() method" into sc-dev
2021-04-21 00:57:08 +00:00
Kweku Adams
6e9b1e4a90
Clean up SyncManager.
...
1. Remove unused variables
2. Remove random selection of new job ID and make sure we always exit
the loop. New job IDs will be selected more deterministically.
3. Query pending system jobs only once instead of for every potential
new job ID.
4. Switch from iterator to basic for loop.
Bug: 169959994
Test: atest ContentResolverTest (all)
Test: atest CtsSyncManagerTest
Test: atest SyncOperationTest
Test: atest SyncManagerTest
Test: atest SyncRequestTest
Change-Id: Iff0f8edba8d424075f64a95e523b8c0c986aab33
2021-04-20 17:49:35 -07:00
Joanne Chung
497dadea9c
Merge "Remove the deprecated APIs in UiTranslationManager." into sc-dev
2021-04-21 00:48:53 +00:00
Benedict Wong
85d294282c
Rename get/setRetryInterval to get/setRetryIntervalsMs
...
Per API feedback, the get/set methods for retry intervals are renamed to
be plural, and have time units
Bug: 184612525
Test: atest FrameworksVcnTests
Test: atest CtsVcnTestCases
Change-Id: I51b3ffcfa44f72805f359e56b263da2558325372
2021-04-21 00:44:37 +00:00
Roshan Pius
3deea32184
Merge changes from topic "uwb_aosp_service_permission" into sc-dev
...
* changes:
UwbService: Enforce UWB_RANGING runtime permission
UwbService: Enforce UWB_PRIVILEGED permission
2021-04-21 00:34:54 +00:00
Joanne Chung
be20ca46f6
Merge "API feedback: Translation View API refinement." into sc-dev
2021-04-21 00:29:24 +00:00
Andy Hung
d6c0a357ab
Merge changes from topics "360RA channel mask", "audio channels" am: b1060eb9f5
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1669510
Change-Id: Ia821a6b7b843569acc9797d1806beed84a615071
2021-04-21 00:28:37 +00:00
Adam He
1c3372f37d
Merge "Remove onError from translationResultCallback." into sc-dev
2021-04-21 00:26:34 +00:00
Chiachang Wang
8aaa2bc109
Merge "Remove framework-connectivity from the private API" into sc-dev
2021-04-21 00:25:20 +00:00
Winson Chung
839b9a1147
Merge "Skip some unnecessary allocations" into sc-dev
2021-04-21 00:17:01 +00:00
Michael Groover
2947561500
Refactor Telephony phone number access checks to LegacyPermissionMgr
...
The TelephonyPermissions phone number access check can require several
interactions with the system_server to obtain the targetSdkVersion
and check the required permissions / appops for the requesting
package. This commit refactors all of these checks into the
LegacyPermissionManager (similar to what was previously done for the
device identifier access checks), requiring only a single request
to the system_server to check all non-subscriber access requirements.
Fixes: 159662444
Test: atest TelephonyPermissionsTest
Test: atest LegacyPermissionManagerServiceTest
Test: atest SmsManagerTest
Test: atest PhoneNumberTest
Test: atest SubscriptionControllerTest
Test: atest TelephonyManagerTest
Change-Id: I6c5cdbeecc2c4a2e200dcc33eedcb9213376f1ad
2021-04-20 17:15:59 -07:00
Amit Mahajan
9753f5c383
Merge "Re-expose TrafficDescriptor.Builder for testing." into sc-dev
2021-04-20 23:58:05 +00:00
Andy Hung
b1060eb9f5
Merge changes from topics "360RA channel mask", "audio channels"
...
* changes:
AudioFormat: Support 13ch audio layout for 360 Reality Audio
AudioFormat: Add channel mask constants for immersive 3D audio
2021-04-20 23:52:21 +00:00
Robert Carr
c3d4925a04
SurfaceControl: Fix builder
...
Recently introduced check for isBufferQueueLayer doesn't work
because the FX_SURFACE_NORMAL flag is 0x0 not 0x1 as expected.
Bug: 185941687
Test: Existing tests pass
Change-Id: I1b341bffcd8b0f0c0e7f2e3da27cb201b6e1d6ff
2021-04-20 16:50:58 -07:00
Rahul Sabnis
edad7c7c60
Update docs to reflect LE batch scan report delay floor
...
Tag: #feature
Bug: 167340030
Test: Manual
Change-Id: Ieeb0e6bccfc316fd4c8cdc40f6865b4185d6d9e8
2021-04-20 16:40:15 -07:00
TreeHugger Robot
466a9e2b68
Merge "Turn on rounded corners on PIP with a flag" into sc-dev
2021-04-20 23:24:00 +00:00
Hui Wang
7e82b02b28
Change default ims max retry times
...
Bug: 185099514
Test: make, manual
Change-Id: I7f04710540809d9f6d3df3f34cfb3a6e45dd40a0
2021-04-20 16:13:33 -07:00
Mady Mellor
681f269d78
Merge changes from topic "global_to_secure" into sc-dev
...
* changes:
Fix bubbles for workprofile
Sysui bubbles multiuser fixes: persistence / overflow
Move bubble setting to secure table & support multiuser
2021-04-20 23:06:40 +00:00
Adam He
f187b6dc51
Add back deprecated Translator.translate() method
...
* Deprecatede method was @hide hidden by mistake.
Bug: 185793893
Test: atest CtsTranslationTestCases
Change-Id: I6acfcf866d926d5efd5baf3f711d9906dd95a34e
2021-04-20 15:59:44 -07:00
Paul Duffin
dd9d4ff93e
[automerger skipped] Merge "Fix build error due to null annotations in core platform API" am: 9234c21fa1 am: 865efafcb5 -s ours am: a655f680d2 -s ours
...
am skip reason: skip tag Change-Id I83e3071f851720a9f719cb226f0e84fd731a8f37 with SHA-1 fc7efcbaa6 is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1682027
Change-Id: Ia1c222abf32e4289cc574b995c5813de1c64e0d6
2021-04-20 22:56:44 +00:00
Josh Tsuji
52c0fcde28
Revert "Added exposure effect on ImageWallpaper"
...
This reverts commit 068978ca8585dfb366f4795419e5a28285118caa.
Reason for revert: breaks wakeup
Bug: 185681677
Change-Id: I100846a4698f89ee9bd65492986643c11dc21a8b
2021-04-20 18:54:04 -04:00
Josh Tsuji
2f37db1c42
Revert "Stops ImageWallpaper Thread when phone is idle"
...
This reverts commit c5e0476b46cba2739604078c60842bb6d0bb036b.
Reason for revert: breaks wakeup
Bug: 185681677
Change-Id: I61b12a006415bfd406e8f54db1bc0fe459e1ec0f
2021-04-20 18:53:24 -04:00
TreeHugger Robot
d298b47ae1
Merge "Simplify running job checking." into sc-dev
2021-04-20 22:52:36 +00:00
TreeHugger Robot
f31b6ef00d
Merge "Hide call strength slot when QSBH expands" into sc-dev
2021-04-20 22:42:10 +00:00
Suprabh Shukla
508e114192
Adding a permission to Shell for testing
...
Adding UPDATE_DEVICE_STATS to enable testing alarms with WorkSource
objects.
Test: atest CtsAlarmManagerTestCases
Bug: 185530825
Change-Id: Ia0f8afa6dc1a13c95553b691f352c6d8c7ae5ccf
Merged-In: Ia0f8afa6dc1a13c95553b691f352c6d8c7ae5ccf
2021-04-20 15:32:03 -07:00
Paul Duffin
a655f680d2
[automerger skipped] Merge "Fix build error due to null annotations in core platform API" am: 9234c21fa1 am: 865efafcb5 -s ours
...
am skip reason: skip tag Change-Id I83e3071f851720a9f719cb226f0e84fd731a8f37 with SHA-1 fc7efcbaa6 is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1682027
Change-Id: Ib204dbaad44aff6c7a85c3f888355b93f16528a8
2021-04-20 22:26:27 +00:00
Evan Severson
98237a95ff
Merge "Fix typo in sensor privacy init" into sc-dev
2021-04-20 22:23:04 +00:00
Benedict Wong
86fe361cfa
[automerger skipped] Merge changes Ib0690243,I0cabce70,I8f13a0d8,I81efeaa4,I488f6208 am: c66289ebd2 am: 0d9a455904 am: 62f75bd114 -s ours
...
am skip reason: skip tag Change-Id Ib0690243f176a2f074358fcc8430f1fd7c3d0d3c with SHA-1 ffc912dace is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1674349
Change-Id: Ic57909442fdbacec022a4ff03613c3e02000199e
2021-04-20 22:16:01 +00:00
Benedict Wong
6881d95596
[automerger skipped] Remove use of network scores, and provider IDs in VcnNetworkProvider am: 39659bf29a am: 1dd137dad5 am: 0ddc8c051f -s ours
...
am skip reason: skip tag Change-Id I0cabce702cfd8457fd1a152af07a847b87d67028 with SHA-1 fff0f8ba33 is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1674348
Change-Id: Ib1203f1cbbc3ab84460b8e0ed9c3839e214e989e
2021-04-20 22:15:54 +00:00
Benedict Wong
66c4267e22
[automerger skipped] Improve dump detail am: 7bdcb188b2 am: 7bfb37719d am: 84ae45ccec -s ours
...
am skip reason: skip tag Change-Id I8f13a0d8fe54e9bf8948e9576e9705024fe79611 with SHA-1 1ce20d65e0 is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1674347
Change-Id: I2bbc9b5941f2f3e69f75c1723a29437b09d986ab
2021-04-20 22:15:38 +00:00
Benedict Wong
1b3e11dd46
[automerger skipped] Disable INTERNET/DUN when mobile data toggled off am: 061c84ba27 am: 725dcd8103 am: f180bb7e2c -s ours
...
am skip reason: skip tag Change-Id I81efeaa4b129443b08a597ff45e0037ddefeb414 with SHA-1 fcacb06752 is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1670525
Change-Id: Ica3cd2083d31b0b057519fd55af6689beacc6e5d
2021-04-20 22:15:31 +00:00
Chiachang Wang
ec505f08ce
[automerger skipped] Remove hidden connectivity method access in FrameworksVcnTests am: 580fda2670 am: e388cc5d73 am: 96dd517081 -s ours
...
am skip reason: skip tag Change-Id I488f62089d1dbe93c232f892885d944bef896df6 with SHA-1 18f3a26efa is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1680126
Change-Id: If68bd663c28bda13548f7e423103addc4f1d8e65
2021-04-20 22:15:21 +00:00
Nate Myren
1fde398f7f
Add EXTRA_AUDIO_INJECT_SOURCE to RecognizerIntent
...
Add a constant to signify that the caller of a RecognitionService has
opened an audio stream for the service
Bug: 185936177
Test: build
Change-Id: Id8da84714fef547d2143457c2ad1c0b631e40741
2021-04-20 22:12:58 +00:00
Steve Elliott
a23475b182
Merge "Make smart reply insertion logic more robust" into sc-dev
2021-04-20 22:12:33 +00:00
Ashwini Oruganti
41c544c592
Make ActivityInfo#attributionTags public.
...
Bug: 182979908
Test: TH
Change-Id: Ifefefe02c27481d3de9a3c1f0b82953278705fcf
2021-04-20 15:07:19 -07:00
TreeHugger Robot
18ecd98109
Merge "[pm] remove incremental startable/unstartable code" into sc-dev
2021-04-20 22:03:22 +00:00
Paul Duffin
865efafcb5
Merge "Fix build error due to null annotations in core platform API" am: 9234c21fa1
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1682027
Change-Id: Ib53ff4dbcc1d341f92d3550495cc91cff5890844
2021-04-20 22:02:29 +00:00
TreeHugger Robot
6b23dfbd0b
Merge "Stop throwing if the label is null" into sc-dev
2021-04-20 21:55:57 +00:00
Benedict Wong
62f75bd114
Merge changes Ib0690243,I0cabce70,I8f13a0d8,I81efeaa4,I488f6208 am: c66289ebd2 am: 0d9a455904
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1674349
Change-Id: Icf3db2e41b31de39e397147008dea0bcd3acaadc
2021-04-20 21:52:38 +00:00
Benedict Wong
0ddc8c051f
Remove use of network scores, and provider IDs in VcnNetworkProvider am: 39659bf29a am: 1dd137dad5
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1674348
Change-Id: Iccb006ec8875d6b496e74db0b6dcf96136e0d93a
2021-04-20 21:52:35 +00:00
Benedict Wong
84ae45ccec
Improve dump detail am: 7bdcb188b2 am: 7bfb37719d
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1674347
Change-Id: Icc8b52c4a631234440cadd311ee24f85f7d66922
2021-04-20 21:52:33 +00:00
Benedict Wong
f180bb7e2c
Disable INTERNET/DUN when mobile data toggled off am: 061c84ba27 am: 725dcd8103
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1670525
Change-Id: Icd6ba18d98677986f8a939937b7c35532fceb51f
2021-04-20 21:52:30 +00:00
Chiachang Wang
96dd517081
Remove hidden connectivity method access in FrameworksVcnTests am: 580fda2670 am: e388cc5d73
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1680126
Change-Id: I7b69cc608cbdca87a9910287125327deca090be2
2021-04-20 21:52:27 +00:00