Commit Graph

31531 Commits

Author SHA1 Message Date
Greg Kaiser
8720228eba Merge "Revert "Support api to control data by thermal service"" 2020-05-05 19:57:48 +00:00
Greg Kaiser
94b46ef784 Revert "Support api to control data by thermal service"
Revert "CTS test for api to control data by thermal service"

Revert "Support api to control data by thermal service"

Revert "Support api to control data by thermal service"

Revert submission 11171206-setDataEnabled

Bug: 155765311
Reason for revert: wembley gets into boot loop on reboot due to this code
Reverted Changes:
I3cdab9b04:Support api to control data by thermal service
I716cf6c45:CTS test for api to control data by thermal servic...
Ic5634e6f7:Support api to control data by thermal service
I763c422ba:Support api to control data by thermal service

Change-Id: If023dc8e106650b63706c0a5df24850c1260f785
2020-05-05 16:47:47 +00:00
Hall Liu
598883a072 Merge "Add the addServiceAnnouncement API for EMBMS" 2020-05-05 01:57:49 +00:00
Yuncheol Heo
cac5bb32ec Merge changes from topic "immersive" into rvc-dev am: 8f4363a226 am: 8752446dab am: 7ac3c1b8b6 am: 1092daf3a5
Change-Id: I541272cb1a0f4aac2990a59133025e4af78c7029
2020-05-05 01:10:29 +00:00
Yuncheol Heo
7ac3c1b8b6 Merge changes from topic "immersive" into rvc-dev am: 8f4363a226 am: 8752446dab
Change-Id: Ic26e9ea346dba0b540f4d437f246ebde705522e8
2020-05-05 00:44:23 +00:00
Yuncheol Heo
8f4363a226 Merge changes from topic "immersive" into rvc-dev
* changes:
  Add test api getStatus/NavigationBarBackgroundView.
  Notify the visibility change to update color views without control.
2020-05-05 00:14:09 +00:00
Sooraj Sasindran
1e9c1966e6 Merge "Support api to control data by thermal service" 2020-05-04 23:49:27 +00:00
Hall Liu
c045df60be Add the addServiceAnnouncement API for EMBMS
Add addServiceAnnouncement to MbmsDownloadSession, allowing apps to add
service announcements from group call servers and receive information
about available files via the MbmsDownloadSession API surface.

Fixes: 144368478
Test: CTS
Change-Id: I760400f56219879fe71d0115042a3be2f83cef90
2020-05-04 15:10:33 -07:00
Yuncheol Heo
70c4bb9007 Add test api getStatus/NavigationBarBackgroundView.
Introduces new test api to access the background view of status bar and
navigation bar.

Bug: 154720832
Test: atest WindowInsetsPolicyTest

Change-Id: If38d3f57edfbb2631d4c1e47ed5347a332edacfb
2020-05-04 14:36:43 -07:00
Dichen Zhang
dbb2be9634 Merge "MediaMetadataRetriever: unhide bits per sample and sample rate keys" 2020-05-04 20:56:24 +00:00
Dichen Zhang
8508308f4d MediaMetadataRetriever: unhide bits per sample and sample rate keys
Bug: 153915801
Test: update-api
Change-Id: Ic573d2da152ac074dad62f86255397a55cc5e173
2020-05-04 09:58:39 -07:00
TreeHugger Robot
1766e14e10 Merge "Make Drawable#hasFocusStateSpecified public" 2020-05-04 16:53:18 +00:00
Sooraj Sasindran
ea5e69c414 Support api to control data by thermal service
Support api to control data by thermal service
Restructure data enablement API to have single API
with reason as an input to stop adding new apis
for new usecases.

Bug: 151342791
Test: added new CTS tests and verified

Change-Id: I763c422ba54907984977d19b2774c31337e5ffe5
2020-05-04 09:28:14 -07:00
Svet Ganov
38cd221d81 Updating platform SDK version for R
* Finalize resources
  * Update appt/aapt2 constants
  * Update R and SDK constants
  * Fix a crashloop bug

Test: build + boot

bug:150281259

Change-Id: Ie56e12336cd1fcf347ac7164f6988b0c2da77c7d
Merged-In: Ie56e12336cd1fcf347ac7164f6988b0c2da77c7d
2020-05-03 09:58:54 -07:00
Svet Ganov
d459a8da1e Revert an API breaking changes
bug:150281259

Test: N/A

Exempt-From-Owner-Approval: porting upstream

Change-Id: Ie30286456af15dd7b81bceb0547ffe8bfac422d2
Merged-In: Ie30286456af15dd7b81bceb0547ffe8bfac422d2
2020-05-03 05:38:43 +00:00
Svet Ganov
87ccbfaa46 Updating platform SDK version for R
* Finalize resources
  * Update appt/aapt2 constants
  * Update R and SDK constants
  * Fix a crashloop bug

Test: build + boot

bug:150281259

Exempt-From-Owner-Approval: merge conflict resolution

Change-Id: Ie56e12336cd1fcf347ac7164f6988b0c2da77c7d
Merged-In: Ie56e12336cd1fcf347ac7164f6988b0c2da77c7d
2020-05-02 14:26:57 -07:00
Svetoslav Ganov
13308eb260 Merge changes from topic "RVC-SDK-Finalization-master"
* changes:
  Revert an API breaking changes
  Updating platform SDK version for R
2020-05-02 15:13:07 +00:00
Svet Ganov
ea8a2145c9 Revert an API breaking changes
bug:150281259

Test: N/A

Change-Id: Ie30286456af15dd7b81bceb0547ffe8bfac422d2
2020-05-01 15:25:51 -07:00
Svet Ganov
ed460aa186 Updating platform SDK version for R
* Finalize resources
  * Update appt/aapt2 constants
  * Update R and SDK constants
  * Fix a crashloop bug

Test: build + boot

bug:150281259

Change-Id: Ie56e12336cd1fcf347ac7164f6988b0c2da77c7d
2020-05-01 15:25:27 -07:00
TreeHugger Robot
c8ce55ce24 Merge changes from topic "displayAreaOrganizer_migration"
* changes:
  The one handed UX of auto-stop one handed by conditions (10/N)
  TouchHandler to handle touch events inside & outside displayArea (9/N)
  Implement Timer for one handed to handle auto-exit (8/N)
  Implement DisplayArea Animation/Transition for one handed (7/N)
  Register DisplayAreaOrganizer for one handed (6/N)
  Create OneHandedSettingsUtil handle settings configs (5/N)
  Sysui-infra for one handed mode (1/N)
2020-05-01 06:34:30 +00:00
Jake Wharton
eee5ad507a Merge "Revert "Add Activity non-config instance map-like API"" 2020-04-30 23:45:37 +00:00
Jake Wharton
d72728ff08 Revert "Add Activity non-config instance map-like API"
Revert "Tests for non-config instance map"

Revert submission 11077952-non-config-map

Reason for revert: API council would like to go straight to Jetpack
Reverted Changes:
Ib2484d433:Add Activity non-config instance map-like API
Ibc3daf82f:Tests for non-config instance map

Bug: 155401916
Change-Id: I9dd8226375e86d66b8cef3731642c0cf9f74434c
2020-04-30 18:58:01 +00:00
Bill Lin
f872831565 Register DisplayAreaOrganizer for one handed (6/N)
Introduce OneHandeDisplayAreaOrganizer and AnimationController

Test: atest OneHandedDisplayAreaOrganizerTest
Test: atest OneHandedManagerImplTest
Test: atest OneHandedUITest
Test: atest OneHandedSettingsUtilTest
Test: atest SystemUITests
Test: atest DisplayAreaPolicyBuilderTest
Bug: 150747909
Change-Id: I654090adf404214056ef37d83bacd3f65fffc1ff
2020-04-30 15:58:50 +08:00
Chavi Weingarten
afab14ff95 Merge "Remove getLeash from WindowContainerToken" into rvc-dev am: 5a4a5682a2 am: e00fbbe6c4 am: ecccd3de1e am: 906d4d2c1f
Change-Id: Ie01960a15f0134abc4e02a73ba5cf629d930ccd5
2020-04-30 00:46:44 +00:00
Chavi Weingarten
ecccd3de1e Merge "Remove getLeash from WindowContainerToken" into rvc-dev am: 5a4a5682a2 am: e00fbbe6c4
Change-Id: I6fafd649d35f3cf2f7d42eb4dbedbaec477f848a
2020-04-30 00:29:17 +00:00
Chavi Weingarten
6eae26b96f Merge "Remove getLeash from WindowContainerToken" into rvc-dev am: 5a4a5682a2
Change-Id: If2e767cc167267de8f2297194419e297cba53621
2020-04-30 00:18:00 +00:00
Chavi Weingarten
5a4a5682a2 Merge "Remove getLeash from WindowContainerToken" into rvc-dev 2020-04-30 00:16:21 +00:00
Chavi Weingarten
e369976bdc Merge "Added featureId to DisplayAreaInfo" into rvc-dev am: 1e6ef9321a am: 8de96583fa am: c790868ad1 am: a72a05033d
Change-Id: If782ed883ca6f9c3743def0935f39352d41f869c
2020-04-29 23:49:48 +00:00
Chavi Weingarten
c790868ad1 Merge "Added featureId to DisplayAreaInfo" into rvc-dev am: 1e6ef9321a am: 8de96583fa
Change-Id: Ic3c866f94c2b02b2f0a426e6dc3fed2c35e7af7d
2020-04-29 23:29:28 +00:00
Chavi Weingarten
a4da2cdf3c Merge "Added featureId to DisplayAreaInfo" into rvc-dev am: 1e6ef9321a
Change-Id: Id953960a1495314d241fcff6f9c4e665e8d5cfcb
2020-04-29 23:24:50 +00:00
Treehugger Robot
f318caa9c2 Merge "API to get hardware variant (SKU)" am: c042e44813 am: edc94080d9 am: ddad10d8bd am: f1f7256263 am: 67c54e87c0
Change-Id: I3b6633364f8d62197ffe4c72276e72a936757d1a
2020-04-29 22:07:28 +00:00
Treehugger Robot
ddad10d8bd Merge "API to get hardware variant (SKU)" am: c042e44813 am: edc94080d9
Change-Id: I9e15b2c23fdaa934c5b39b7ca347e80d05d58384
2020-04-29 21:37:14 +00:00
Treehugger Robot
c042e44813 Merge "API to get hardware variant (SKU)" 2020-04-29 21:29:37 +00:00
chaviw
8d8b31b833 Added featureId to DisplayAreaInfo
This is something clients will need if they register to listen to
DisplayAreas for several features. This will help distinguish the
DisplayAreaInfos.

Test: Builds
Bug: 152114574
Change-Id: If1d14aee070388274afb6a43bc1c631d79fb4b38
2020-04-29 13:47:26 -07:00
Brad Ebinger
12df9e3d69 Merge "Using RegistrationManager was causing unintended public APIs" 2020-04-29 17:07:04 +00:00
chaviw
7de50009a3 Remove getLeash from WindowContainerToken
If the WindowContainer was revoked from a registered organizer, the
client could still call getLeash to system server and control the leash
for the WindowContainer. Instead, pass the leash back to the client in
onTaskAppeared and onDisplayAreaAppeared. Once the WindowContainer is
revoked from the client, the leash will reference the old
WindowContainer SurfaceControl and will not be able to control the
WindowContainer anymore.

Test: Split screen
Test: DisplayAreaOrganizerTest
Test: WindowOrganizerTest
Bug: 154558563
Change-Id: I1f6eb987a2a3fecfef912a3009ee52989c85ff4b
2020-04-29 09:36:35 -07:00
TreeHugger Robot
61cf1a7460 Merge "Add RoleControllerManagerTest." into rvc-dev am: 447914fcfe am: 0b5b876873 am: a088f92936 am: 079191abb3
Change-Id: If671819827f45d0db2259ad37ba2970740e62a7d
2020-04-29 06:24:34 +00:00
TreeHugger Robot
a088f92936 Merge "Add RoleControllerManagerTest." into rvc-dev am: 447914fcfe am: 0b5b876873
Change-Id: Ieb5eceadbb7fa3e8af73dc215c77b66d741def10
2020-04-29 06:07:43 +00:00
TreeHugger Robot
e1516315da Merge "Add RoleControllerManagerTest." into rvc-dev am: 447914fcfe
Change-Id: If2d1e9f96fcdf103a38934203753170205c76c5d
2020-04-29 05:59:48 +00:00
TreeHugger Robot
447914fcfe Merge "Add RoleControllerManagerTest." into rvc-dev 2020-04-29 05:56:34 +00:00
Hai Zhang
a39cf78c63 Add RoleControllerManagerTest.
Fixes: 155119713
Test: atest RoleControllerManagerTest
Change-Id: If90ba60cccbe1589365142a06d917a87b7a092ef
2020-04-28 12:14:01 -07:00
Hall Liu
ecced7ad86 Merge "Unhide and update documentation for DisconnectCause" am: 61a728aebf am: d4e270a8ef
Change-Id: I63b1ed212848529fac75f072c3b6337e46ab527b
2020-04-28 18:18:22 +00:00
Fan Zhang
0eace7b08a Merge "Add @TestApi to createLaunchEmergencyDialerIntent" into rvc-dev am: b9c9917810 am: 64750d74ea am: f22d19b1ff am: ddfd1fdac6
Change-Id: Ie5124b44c8c74e5c6d3d5ebf6c1845d744c3ec2c
2020-04-28 17:22:08 +00:00
Fan Zhang
f22d19b1ff Merge "Add @TestApi to createLaunchEmergencyDialerIntent" into rvc-dev am: b9c9917810 am: 64750d74ea
Change-Id: I75b6e977fa3a33ab23aa80a6f1c5e97c23e4de40
2020-04-28 16:37:25 +00:00
Fan Zhang
2171cc9535 Merge "Add @TestApi to createLaunchEmergencyDialerIntent" into rvc-dev am: b9c9917810
Change-Id: I9be88f20d3541acb5c76f222c033a2e2f384ed7d
2020-04-28 16:23:56 +00:00
Fan Zhang
f7c753bc16 Add @TestApi to createLaunchEmergencyDialerIntent
Test: build
Bug: 154867896
Change-Id: Id2eb94b233c6c00a81c51d17c5414b3cce5ebdf5
2020-04-28 03:34:17 +00:00
JW Wang
68d6ab7815 Allow app to specify the rollback data policy in the manifest (1/n)
See b/148098864#comment1.

It makes more sense for an app to declare the data policy in their
manifest, rather than leaving this decision to the installer.

The attribute will be read by RollbackManager during install to decide
which data policy to adopt when committing a rollback.

Also migrate to ApkLiteParseUtils per
https://googleplex-android-review.git.corp.google.com/c/platform/frameworks/base/+/11069722/1/core/java/android/content/pm/PackageParser.java#1660.

Bug: 148098864
Test: m
Change-Id: Ie6635249ea0dfbd21b0e56080fb492b9949841ec
2020-04-28 10:48:06 +08:00
Alec Mouri
dd097c3e12 Merge "Remove exposed hidden apis in Point.java" 2020-04-28 01:29:02 +00:00
Brad Ebinger
0cb1eda634 Using RegistrationManager was causing unintended public APIs
Remove the dependency on this interface until it is intended
to be public.

Fixes: 153908410
Fixes: 155097858
Test: atest CtsTelephonyTestCases
Merged-In: Iad82b7d06738468861bd49164fbb4b4dafb8c014
Change-Id: Iad82b7d06738468861bd49164fbb4b4dafb8c014
2020-04-27 18:05:17 -07:00
Hall Liu
6884145ba3 Unhide and update documentation for DisconnectCause
Unhide several constants and update the documentation for
android.telephony.DisconnectCause to reflect where it's being used.

Fixes: 154826441
Test: build
Change-Id: Ib3177367519a704bb469bc494f686c96fb516b85
2020-04-27 17:57:17 -07:00