Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
567,267 Commits 3 Branches 0 Tags
23f9ef4d2bd5146584b258a3761430e52e44fe93
Commit Graph

567267 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Treehugger Robot
7342dafaa5 Merge "Adding a permission to Shell for testing" 2021-04-21 01:49:34 +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
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
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
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
Paul Duffin
9234c21fa1 Merge "Fix build error due to null annotations in core platform API" 2021-04-20 21:34:30 +00:00
Kei Murayama
209bf897de AudioFormat: Support 13ch audio layout for 360 Reality Audio 
- Add definitions for the front bottom channels. The name
   of the definitions are standardized in ITU-R BS.2051-1.
 - Add definition for 13ch mask which consists of surround 5
   channels, top 5 channels and bottom 3ch channels. This
   channel mask is ideal speaker layout used by Sony 360
   Reality Audio. Virtualizer can place individual sounds in
   a 360 spherical sound field from these channels on any
   headphones.

Ignoring checkstyle warning, "'|' should be on a new line",
to keep existing codestyle.

Bug: 185100731
Test: atest AudioFormatTest
Test: Play wav with 13ch mask after OUT_CHANNEL_COUNT_MAX to 24
Change-Id: I2b4deaac740a08ae3b1b8d8453650a876e2d6206
 2021-04-20 14:16:21 -07:00
Andy Hung
8008740a46 AudioFormat: Add channel mask constants for immersive 3D audio 
Bug: 185842397
Test: atest AudioFormatTest
Test: atest AudioTrackTest
Change-Id: I1c85e30c65cf6681928861e7d0cc9d987e4648ce
 2021-04-20 14:16:06 -07:00
Benedict Wong
0d9a455904 Merge changes Ib0690243,I0cabce70,I8f13a0d8,I81efeaa4,I488f6208 am: c66289ebd2 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1674349

Change-Id: Id645834ef4d9a96be7a0cfb12441bf6828a6f53d
 2021-04-20 21:12:26 +00:00
Benedict Wong
1dd137dad5 Remove use of network scores, and provider IDs in VcnNetworkProvider am: 39659bf29a 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1674348

Change-Id: Ie7c5de27214fb4fc97d794e77f6e5c9ebab238eb
 2021-04-20 21:09:09 +00:00
Daulet Zhanguzin
f84ac0f599 Fix build error due to null annotations in core platform API 
Change https://r.android.com/1667508 adds nullability annotations to
the core platform APIs which broke this code with the error:

javadoc: error - In doclet class com.google.doclava.Doclava,  method
start has thrown an exception
java.lang.reflect.InvocationTargetException
com.sun.tools.javac.code.Symbol$CompletionFailure: class file for
androidx.annotation.RecentlyNonNull not found

Bug: 183938110
Bug: 185929373
Test: m checkbuild

Change-Id: I83e3071f851720a9f719cb226f0e84fd731a8f37
Merged-In: I83e3071f851720a9f719cb226f0e84fd731a8f37
 2021-04-20 22:06:32 +01:00
Benedict Wong
7bfb37719d Improve dump detail am: 7bdcb188b2 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1674347

Change-Id: I18dd4f136ea784af5977b9bd7b0a2b0946831863
 2021-04-20 21:03:37 +00:00
Benedict Wong
725dcd8103 Disable INTERNET/DUN when mobile data toggled off am: 061c84ba27 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1670525

Change-Id: I5a1482d06a92c74769f9b0f7c840cb2cc983edd9
 2021-04-20 21:00:55 +00:00
Chiachang Wang
e388cc5d73 Remove hidden connectivity method access in FrameworksVcnTests am: 580fda2670 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1680126

Change-Id: I3ddb3319fd825499c90f0385aff3a3fbaf9ff471
 2021-04-20 20:56:54 +00:00
Benedict Wong
c66289ebd2 Merge changes Ib0690243,I0cabce70,I8f13a0d8,I81efeaa4,I488f6208 
* changes:
  Switch to using NetworkScore instead of legacy integer
  Remove use of network scores, and provider IDs in VcnNetworkProvider
  Improve dump detail
  Disable INTERNET/DUN when mobile data toggled off
  Remove hidden connectivity method access in FrameworksVcnTests
 2021-04-20 20:37:15 +00:00
Nataniel Borges
3ed5afa516 Merge "Revert "Set a floor value for BLE Batch Scan report delay of 5000ms"" am: 6528da5667 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1681445

Change-Id: I705f617f14666683159b4f8dea93b120f14565e7
 2021-04-20 16:31:30 +00:00
Nazanin Bakhshi
96b0148cc4 Merge "Refactoring and mocking to make sure unit test doesn't call the real service" am: 68bf2c52e5 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1668228

Change-Id: Iaaa8635c0c1031f6b7e896c879de9744a1215f54
 2021-04-20 16:27:56 +00:00
Nataniel Borges
6528da5667 Merge "Revert "Set a floor value for BLE Batch Scan report delay of 5000ms"" 2021-04-20 15:52:32 +00:00
Nataniel Borges
5aa369359e Revert "Set a floor value for BLE Batch Scan report delay of 5000ms" 
This reverts commit ea303904fd.

Reason for revert: b/185890964

Change-Id: I270dc16de0e24728c694830fbe920786b6d90174
 2021-04-20 15:50:03 +00:00
Nazanin Bakhshi
68bf2c52e5 Merge "Refactoring and mocking to make sure unit test doesn't call the real service" 2021-04-20 15:44:00 +00:00
Paul Duffin
e8cf665edd Merge "Move icu related hidden API flag file contents to icu" am: 653935b511 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1675890

Change-Id: I3f9ccb4711afc14145ab2a85e66b755cde9748fa
 2021-04-20 11:46:58 +00:00
Paul Duffin
653935b511 Merge "Move icu related hidden API flag file contents to icu" 2021-04-20 11:30:10 +00:00
Paul Duffin
727dfbfe51 Merge "Move art related hidden API flag files to art" am: ef13360a02 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1675868

Change-Id: I1ce363689234a0d4b01e29060ed487d7649231b0
 2021-04-20 11:12:50 +00:00
Treehugger Robot
2171996c65 Merge "Don't update volume in AudioService when SAM is on and ARC is off" am: 461594522b 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1678047

Change-Id: I7926af0cc16f8409dc551c45fc5bc7088c5e9599
 2021-04-20 11:08:10 +00:00
Paul Duffin
ef13360a02 Merge "Move art related hidden API flag files to art" 2021-04-20 11:02:23 +00:00
Treehugger Robot
461594522b Merge "Don't update volume in AudioService when SAM is on and ARC is off" 2021-04-20 10:44:34 +00:00
Treehugger Robot
80deff6a5c Merge "Roll forward: add a test for ParseException" am: 1f43a69d91 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1679759

Change-Id: I17938abef561d95347869084114ee08f90d81db5
 2021-04-20 10:13:47 +00:00
Treehugger Robot
1f43a69d91 Merge "Roll forward: add a test for ParseException" 2021-04-20 10:03:56 +00:00
Remi NGUYEN VAN
f35d4a2d44 Merge "Revert "Add a test for ParseException"" am: fe737812ce 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1679758

Change-Id: Ifb852d9264a6e1fc5ce82a5eb35d66459a021599
 2021-04-20 09:52:35 +00:00
Remi NGUYEN VAN
fe737812ce Merge "Revert "Add a test for ParseException"" 2021-04-20 09:25:07 +00:00
Treehugger Robot
8b159b455f Merge "Update TEST_MAPPING imports for connectivity" am: e063867f7b 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1680905

Change-Id: I100470cc936fca8dba86a1ad083d4d67139b6aea
 2021-04-20 09:06:31 +00:00
Treehugger Robot
e063867f7b Merge "Update TEST_MAPPING imports for connectivity" 2021-04-20 08:45:19 +00:00
Ken Chen
a96493b7a5 Merge "Add CONNECTIVITY_USE_RESTRICTED_NETWORKS permission to shell" am: 1b06ec2530 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1675632

Change-Id: I5ec3328b8bd782bfc184bcbddc7572671e826cbe
 2021-04-20 07:38:50 +00:00
Ken Chen
1b06ec2530 Merge "Add CONNECTIVITY_USE_RESTRICTED_NETWORKS permission to shell" 2021-04-20 07:12:33 +00:00
Remi NGUYEN VAN
52c46df5d9 Update TEST_MAPPING imports for connectivity 
Connectivity CTS tests were moved from cts/tests/net to
packages/modules/Connectivity.

Bug: 185751610
Change-Id: Id4efd99c419706a52ad5d708888097bd6312d4e6
Test: treehugger is needed to test
 2021-04-20 07:10:41 +00:00
Remi NGUYEN VAN
8f5efb2702 Roll forward: add a test for ParseException 
The test simply creates an exception and verifies that it has the
required fields.

The constructor tests are only run on S+ as they are not part of the
API before that.

Change-Id: Ic30a34d3203c1b40923ba783a34f0cfed53a07ae
Test: atest FrameworksNetTests
 2021-04-20 16:04:33 +09:00
Remi NGUYEN VAN
c3915fc7e7 Revert "Add a test for ParseException" 
This reverts commit 54e707a62e.

Reason for revert: Test broken on R: b/185751610

Change-Id: I9f5d25c0ba81011848ab3cf7ec44aa329fbb3b0f
 2021-04-20 16:04:33 +09:00
Treehugger Robot
da5eb08ae3 Merge "Set a floor value for BLE Batch Scan report delay of 5000ms" am: ce2a2c80dd 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1676810

Change-Id: If77fb0d86606fcc8a9b6c8a6b7f95c7990b7a9a2
 2021-04-20 03:07:55 +00:00
Treehugger Robot
ce2a2c80dd Merge "Set a floor value for BLE Batch Scan report delay of 5000ms" 2021-04-20 02:27:23 +00:00
Rahul Sabnis
ea303904fd Set a floor value for BLE Batch Scan report delay of 5000ms 
Tag: #feature
Bug: 167340030
Test: Manual
Change-Id: I4ef99a9562f1447a2ccee42a344384a38a487c19
 2021-04-19 17:29:02 -07:00
Nazanin
52cb2e1571 Refactoring and mocking to make sure unit test doesn't call the real service 
Bug: 180938364
Test: utest
Change-Id: Ic6a5a84c1d985fa02f8cf52c8c2ff144669b30c1
 2021-04-19 17:12:05 -07:00
Tianjie Xu
fa83bba5bf Merge "Revisit the lifetime of the RebootEscrowProvider" am: d746cc814f 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1678645

Change-Id: I0c1c67e28ee46c7647c9ca07099f5476ed5c0877
 2021-04-19 23:12:02 +00:00
Tianjie Xu
894b984747 Merge "Addresses TODO in ResumeOnRebootService Javadoc" am: f58b4a1109 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1673754

Change-Id: I56f15a90d5c136873e29d733d3f57d89a498bdcb
 2021-04-19 23:08:20 +00:00
Tianjie Xu
d746cc814f Merge "Revisit the lifetime of the RebootEscrowProvider" 2021-04-19 23:02:01 +00:00
Tianjie Xu
f58b4a1109 Merge "Addresses TODO in ResumeOnRebootService Javadoc" 2021-04-19 23:01:55 +00:00
Hans Boehm
7644e0c5b7 Merge "Don't fork USAPs with open argument buffer" am: 6c61c65f19 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1651247

Change-Id: I7c9f2568a59670fb6f067b322b6fdd2d9fa34167
 2021-04-19 22:58:08 +00:00
Hans Boehm
6c61c65f19 Merge "Don't fork USAPs with open argument buffer" 2021-04-19 22:33:21 +00:00
Sarah Chin
3c6d7d7dc6 Merge "Update carrier privilege check in enforceSubscriptionPlanAccess" am: 958f9efba5 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1663446

Change-Id: I7bd37f0acb7f939b9fc0311ac0365be3e8587823
 2021-04-19 20:43:48 +00:00
Sarah Chin
958f9efba5 Merge "Update carrier privilege check in enforceSubscriptionPlanAccess" 2021-04-19 20:29:09 +00:00