Commit Graph

10530 Commits

Author SHA1 Message Date
Lais Andrade
864d640e8d Merge "Remove VibrationEffect javadocs to methods not available in public APIs." into tm-dev am: 40739d5379 am: 6c9ae0c881
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19927366

Change-Id: Ic1f5ba8452dd775377d3e60400f274cc8747f9d7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-16 15:33:10 +00:00
Grace Cheng
8efbf0ee61 Merge "Adds a function in LM for fetching ADAS allowlist" into tm-qpr-dev 2022-09-15 17:54:32 +00:00
Lais Andrade
1c36dbb35a Remove VibrationEffect javadocs to methods not available in public APIs.
Change already landed in aosp/2214741. Need to land this fix in tm-dev for it to show up in the published reference docs.

Change-Id: Idf5a339a5fb0ffd510e7fda0e3784916c8505eae
Merged-In: Idf5a339a5fb0ffd510e7fda0e3784916c8505eae
Bug: 245491186
Test: N/A
2022-09-12 16:04:18 +00:00
Hani Kazmi
494fbd29d2 Merge "Add javadoc note about bug in readParcelableCreatorInternal" into tm-dev am: 5421a3f422 am: 530c9780d8
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19459102

Change-Id: I6874ba1e634a7b344bd5e7d410a8c6ec0324060d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-06 13:33:25 +00:00
Hani Kazmi
5421a3f422 Merge "Add javadoc note about bug in readParcelableCreatorInternal" into tm-dev 2022-09-06 12:39:44 +00:00
Zixuan Qu
442f33f79e Merge "Register VibrationSettings as a listener to: 1) virtual displays creation and removal. 2) App Uids running on virtual displays. These will be used in combination to ignore vibration initiated from a virtual display." into tm-qpr-dev 2022-09-02 16:18:58 +00:00
Hani Kazmi
5ffffa5702 Add javadoc note about bug in readParcelableCreatorInternal
follow up to b/232589966. Bug was fixed in master, but did not have time
to merge into T. Adding a note to aid developers in using the old API if
impacted.

Test: m
Bug: 240585930
Change-Id: Ibd80007b63ff8d2ad87e18c6c4d0ffedb5184ff5
2022-09-02 14:06:45 +00:00
Zixuan Qu
913ddceb07 Register VibrationSettings as a listener to:
1) virtual displays creation and removal.
2) App Uids running on virtual displays.
These will be used in combination to ignore vibration initiated from a virtual display.

This change also consolicates the fix to avoid Null reference when VirtualDeviceManger
is not present in the available system services. See also ag/19744341.

Test: VibrationSettingsTest, VibratorManagerServiceTest

bug: 189474679

Change-Id: Ie10dbfe65bb3ab9d62ed5c7b5ed7095a51bccf24
Merged-In: Ie10dbfe65bb3ab9d62ed5c7b5ed7095a51bccf24
(cherry picked from commit a0ae5c1951)
2022-09-01 18:01:59 +00:00
Grace Cheng
390046b0db Adds a function in LM for fetching ADAS allowlist
Bug: 244264468
Test: none

Change-Id: I0bf0d4e0ef45aea8726d52bc661a6713c5e986ce
2022-08-31 16:56:45 +00:00
Hani Kazmi
c4b81cbee0 Update BaseBundle to not use LazyValues when using ReadWriteHelper
This is a partial backport of ag/19532036. It fixes a bug where a
LazyValue might have been pointing to a parcel which was already
recycled.

Bug: 240138318
Test: atest android.os.cts.ParcelTest android.os.cts.BundleTest
android.os.BundleTest android.os.ParcelTest
android.os.BundleRecylingTest
Test: Running PoC app from linked bug

Change-Id: I3acf7127fdf373ee8b38a55702ae315be499601c
Merged-In: I8a878a6d0055b04b2611909b4b17977ba5677a4f
2022-08-30 12:42:01 +00:00
Neha Jain
900e693d58 Merge "Revert "Remove BatteryStats user activity types and use PowerManager ones instead."" into tm-qpr-dev 2022-08-26 00:48:04 +00:00
Neha Jain
e8ab134de1 Revert "Remove BatteryStats user activity types and use PowerManager ones instead."
This reverts commit 79e517c3d4.

Reason for revert: b/243434675

Change-Id: Ie2476f23715ed933064470ee2f50d550e92d46b8
Merged-In: I5cfdd6a7c21ed322f50d7605fdd470b41726f4cf
2022-08-25 20:34:31 +00:00
Anna Bauza
bf5c8123ad Add Android Multiuser Atom which will contain number of supported users.
Metric [Design Doc approved](https://eldar.corp.google.com/assessments/860295929/revisions/1?jsmode=du&mods=eldarui_search#sections/999001).

Bug: 240582354
Test: statsd_testdrive 10160
Change-Id: I3cfbd2f79e71df6b2952d73d5a2bd20268708129
(cherry picked from commit c3249a8704)
Merged-In: I3cfbd2f79e71df6b2952d73d5a2bd20268708129
2022-08-23 19:01:37 +00:00
Philip Junker
28930b91d8 Merge "Remove BatteryStats user activity types and use PowerManager ones instead." into tm-qpr-dev 2022-08-23 14:54:04 +00:00
Philip Junker
79e517c3d4 Remove BatteryStats user activity types and use PowerManager ones instead.
Add millisSinceLastUserActivity and lastUserActivityEvent to PowerGroup log when dozing.
Add timeout to PMS log when dozing.

Bug: 243518837
Test: atest BatteryStatsTests
Test: atest PowerManagerServiceTest
Test: manually observe logs using logcat / adb bugreport
NoNonSdkCheck: USER_ACTIVITY_TYPES is only accessed indirectly by apps through dumpLocked() method.
Change-Id: I835992a08bd4a07350e36ef671c6273c8fee43a0
(cherry picked from commit bf794e4585)
Merged-In: I835992a08bd4a07350e36ef671c6273c8fee43a0
2022-08-23 14:48:09 +00:00
Hani Kazmi
d2f9cc6342 Update BaseBundle to not use LazyValues when using ReadWriteHelper
This is a partial backport of ag/19532036. It fixes a bug where a
LazyValue might have been pointing to a parcel which was already
recycled.

Bug: 240138318
Test: atest android.os.cts.ParcelTest android.os.cts.BundleTest
android.os.BundleTest android.os.ParcelTest
android.os.BundleRecylingTest
Test: Running PoC app from linked bug

Change-Id: I3acf7127fdf373ee8b38a55702ae315be499601c
Merged-In: I8a878a6d0055b04b2611909b4b17977ba5677a4f
2022-08-23 13:01:46 +00:00
Oli Lan
37471ba1ce Check for null application context in UserManager.
UserManager currently always uses getApplicationContext for its
internal context object, but that method can return null under certain
circumstances. This CL adds a null check, so that the original context
is used if the app context is null.

Bug: 232179155
Bug: 233915566
Test: atest UserManagerTest
Test: install Apex Launcher and App Hider on device with work profile
Change-Id: I26bcf693da8f5bc53126f79f9e6ffb17bd87fc84
2022-07-28 17:15:05 +01:00
Hani Kazmi
ad4244ec44 Merge "BaseBundle.java: Adding tests for 'Recycle underlying parcel for bundle'" into tm-dev am: 6b07af5e83 am: c388f2b9d0
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18929334

Change-Id: Iee33adbe2a5efcdad1b18bac03b2cae81ebda658
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-29 11:42:12 +00:00
Hani Kazmi
621dc99968 BaseBundle.java: Adding tests for 'Recycle underlying parcel for bundle'
Follow up to ag/18795008. Adding tests for new behaviour.

As it is not possible to directly check on the bundle if the parcel has been recycled,
we inject a spy into it. Mocking static methods is not possible in
FrameworkCoreTests, so we introduce a new test class in
FrameworksMockingCoreTests which is run when any parcel or bundle source
file changes.

Bug: 233216232
Test: atest BundleRecyclingTest

Change-Id: If691b68a8db1f0110d131ec620935f566cc9367b
2022-06-24 12:07:29 +00:00
Hani Kazmi
2b13efde11 BaseBundle.java: Recycle underlying parcel when bundle is cleared. am: 2685de9862 am: 28752b7242
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18795008

Change-Id: I799f8cda2fc1c794bfdfa7b945306a7f73709107
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-14 12:43:49 +00:00
Hani Kazmi
2685de9862 BaseBundle.java: Recycle underlying parcel when bundle is cleared.
Lazy Bundles, (aosp/1787847), introduced a change in behavior where a Parcel
created as part of initializing a Bundle is dependent on the next ART GC run to be
recycled, causing a short term memory-leak.

To land this in T, we are making the change targetted and allowing
consumers to opt into the parcel being immediately cleared by calling
.clear() on the bundle.

As part of the unparcel() in clear(), mParcelledData is set to null, and
mMap may or may not still contain references through lazy values,
depending on if the lazy valyes have been unmarshalled.  As
such, we keep a weak reference to mParcelledData we can use to recycle it.

The mParcelledData reference could have been copied to other bundles in
a few operations:
new Bundle(Bundle o)
bundle.deepCopy()
bundle.putAll()

In this case we can not recycle the parcel yet as other bundles may
still require it. If so, we will skip the recycle and rely on the later GC pass

Bug: 233216232
Test: Reproduced linked bug on-device
Test: atest android.os.cts.ParcelTest android.os.cts.BundleTest android.os.BundleTest android.os.ParcelTest
Change-Id: Ic26eceaa1c11da67866af0963f760423d41d54bc
2022-06-14 09:10:53 +00:00
Sanjana Sunil
ad494b49bb Merge "Set correct volume storage path for SDK sandbox" into tm-dev am: 0b28d29298 am: 49f81abcbe
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17983856

Change-Id: I2f605ab06441b647bd46eb80271509090aa8e336
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-18 21:59:50 +00:00
TreeHugger Robot
5e287d77d9 Merge "Improve javadoc for Wi-Fi related policies" into tm-dev am: e51b62b2a3 am: 46c447841b
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18374443

Change-Id: I1116841f8b67c8fc0859e02af4c21dae18c922bf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-18 21:53:35 +00:00
TreeHugger Robot
41bfea28c0 Merge "Check sleep reason and time before cancelling vibrations" into tm-dev am: 79dc62bfef am: 7aff58a3f9
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18280949

Change-Id: I9915fca86dc75f3a0a6a1a4051a37ca8536565b6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-18 21:53:22 +00:00
Sanjana Sunil
0b28d29298 Merge "Set correct volume storage path for SDK sandbox" into tm-dev 2022-05-17 15:40:12 +00:00
TreeHugger Robot
e51b62b2a3 Merge "Improve javadoc for Wi-Fi related policies" into tm-dev 2022-05-16 22:04:37 +00:00
Sanjana Sunil
79241ae7d9 Set correct volume storage path for SDK sandbox
Context.getDataDir() for SDK sandbox incorrectly returns /data volume
path even if the actual storage is on another volume. This CL sets the
correct storage path by checking the uuid from the ApplicationInfo of
the client app and setting it to the same value.

Bug: 229736419
Test: atest
SdkSandboxStorageHostTest#testSdkSharedStorage_DifferentVolumeIsUsable

Change-Id: Ib72ea559363cdeb4b7cfcc2f48ca8ddace96e352
Merged-In: Ib72ea559363cdeb4b7cfcc2f48ca8ddace96e352
2022-05-16 15:43:37 +00:00
Rubin Xu
1638b20f44 Improve javadoc for Wi-Fi related policies
Bug: 226128486
Test: none
Change-Id: I21f0f0eb1f9a4754d42f4ae3c8e8a36865d58afa
2022-05-16 15:38:14 +00:00
Lais Andrade
c558857fc7 Check sleep reason and time before cancelling vibrations
Add a method PowerManagerInternal.getLastGoToSleep(), similar to
existing method getLastWakeup(), to retrieve global values for last go
to sleep events, including system uptime and reason.

Retrieve this data in VibratorManagerService before cancelling ongoing
vibrations by the broadcast of ACTION_SCREEN_OFF intents to indicate
that the screen was turned of when the vibration was still playing. This
new logic allows vibrations to continue in the following cases:

- the broadcasted event was triggered before the vibration started;
- there is already a wakeup event triggered by the time the screen off
  broadcast is being processed by the vibrator service;
- the screen off reason is in allowlist, indicating it's an
  automatically triggered event (screen timeout or user inattentive);

This should handle the following scenarios:

- delayed broadcasts of screen off events, that should not cancel
  vibrations that started when the screen was already off (e.g.
  notification or ringtone that are allowed to vibrate in that state);

- race conditions when the screen automatically turns off right after a
  ringtone/notification vibration starts, before the notification
  acquires a screen lock;

Fix: 219849350
Test: VibrationSettingsTest
Change-Id: I358327192196989a7d4fc49a96b2ab92ec677302
2022-05-13 19:53:43 +01:00
Samiul Islam
43be403330 Merge "Disallow external storage access without restricting other api calls" into tm-dev am: 5f0c868b6a am: c545627a16
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17940795

Change-Id: I4a63904db958fc3222402ce2b8656cec19e33e61
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-06 15:40:58 +00:00
Samiul Islam
5f0c868b6a Merge "Disallow external storage access without restricting other api calls" into tm-dev 2022-05-05 13:39:34 +00:00
Adam Bookatz
7a5725bfe6 Merge "Ensure getUserName cannot return null" into tm-dev am: 1503b56202 am: 10b45a2107
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18126297

Change-Id: Ib4bc41d74d8f486e79e43e7b332c93a2051c562b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 17:58:46 +00:00
Adam Bookatz
1503b56202 Merge "Ensure getUserName cannot return null" into tm-dev 2022-05-04 17:20:45 +00:00
Robert Horvath
4d3c2b3b3e Merge changes I6a3f56bd,Ib5f39eb1 into tm-dev am: 1999fa1097 am: 7d58f8562f
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17888925

Change-Id: I27355b6f1a0a429edd2a0a90d23022a849e1ff48
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 13:29:10 +00:00
Adam Bookatz
cd2466ee30 Ensure getUserName cannot return null
A user can be created with an explicitly null name, as happens in tests.
But getUserName claims to never return null. So we must do a null-check
here to prevent it.

Bug: 227624966
Test: atest UserManagerTest
Change-Id: Iea0e7b6292c6dd49df1bebc5467091a82ddaedb5
2022-05-02 20:18:54 +00:00
Robert Horvath
d112201586 Batch log access requests from same client
For multiple log access requests from the same client
(same UID + package name) within a short timeframe, show only one
confirmation prompt to the user.

When access has been approved/denied, further requests will
automatically be approved/denied until another timeout expires, after
which a new request will show a prompt again.

If the prompt is shown but the request isn't approved or denied within a
certain time, the client will automatically be denied access.

Moved the approve/decline methods out of ILogcatManagerService into a
local service, so that they can only be called from within the system
server.

Bug: 229976778
Test: atest FrameworksServicesTests:LogcatManagerServiceTest
Change-Id: I6a3f56bdcbb84e64b1b24e73476bd24f32b75f24
2022-05-02 15:19:43 +02:00
Samiul Islam
db9e238ec7 Disallow external storage access without restricting other api calls
Currently, sandbox cannot call any apis from StorageManager that checks
calling package has same uid as calling uid. This CL fixes that by using
pm.isSameApp() api.

Additionally, since Environment.java fetches the initial application
context, the uid for that does not fall under the sandbox uid range. It
falls under app uid range. We fix the problem by checking for
PROPERTY_NO_APP_DATA_STORAGE flag on the application.

Bug: 228424287
Test: atest CtsSdkSandboxInprocessTests (see ag/17657742)
Change-Id: I8d9fca369cfbed47b40a42a44a40ff73acb712ec
2022-04-28 15:39:26 +01:00
Trevor Black
c794a11edc Merge "Add Vulkan 1.2 and 1.3 to getVulkanVersion()" into tm-dev am: 3f598fadcd am: b976b9b638
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17891135

Change-Id: Icfedb73b68a1cc95f3071d476d532c53a61fa583
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-25 05:41:47 +00:00
Trevor David Black
bf22232e3c Add Vulkan 1.2 and 1.3 to getVulkanVersion()
Bug: 191881132
Test: build
Change-Id: I73d18850180f2d7a627fb3879e4653d0e470d6fb
2022-04-21 18:03:07 +00:00
Kedar Chitnis
c60e7c4119 Guest mode updates to resolve privacy concerns in guest mode
- Add API in IUserManager to allow setting ephemeral user flag
- Implement and export this API in UserManagerService and UserManager
- Set guest as ephermal by default when createGuest in UserManager is called
- Handle guest user switching in UserSwitcherController for the case
  of dynamic change of ephemeral state
- Add persistant notification when in guest mode to indicate
  - if guest session is new or previously used.
  - if guest session will be cleared on exit or not
- Add buttons in persistant notification to reset or exit guest
- Add flags to enable/disable this feature

Bug: 214031645
Screenshots: go/ephemeral-guest-b-214031645-ux
Test: Manual test using sunfish, atest SystemUITests, atest SettingsRoboTests

Relands ag/16545010 after resolving post submit issues

Revert "Revert "Guest mode updates to resolve privacy concerns in guest mode""
This reverts commit dd5c440802.

Change-Id: I46b8ab527bab8fe665114ed0fffbb06a59d49a77
Merged-In: I46b8ab527bab8fe665114ed0fffbb06a59d49a77
2022-04-14 09:47:35 +00:00
Yurii Zubrytskyi
f453228161 frameworks/base - Tiramisu is now 33 #2
Set current API level

Test: Build and boot
Bug: 225745567
Change-Id: If135d9795e812cc286c720b9351eaf6be621fd5b
2022-04-12 12:35:04 -07:00
Lee Shombert
ead48cc667 Merge "Helper classes for IpcDataCache clients" into tm-dev 2022-04-12 14:32:31 +00:00
Lee Shombert
529a49ee3d Helper classes for IpcDataCache clients
Bug: 227653108

This adds a helper class that can reduce much of the boilerplate in
code that uses IpcDataCache (or the internal-only variant,
PropertyInvalidatedCache).  See the changes to DevicePolicyManager for
example usage.

Two PropertyInvalidatedCaches APIs are exposed for testing.  The
method createPropertyName() is changed so that apis like "Foo" are
converted to "foo", not "_foo".

Unit tests for the new behavior are added to IpcDataCacheTest.

This was manually tested by dumping the cache info from builds with
and without this change.  Special attention is paid to the
DevicePolicyManager caches.  The same caches were found (as identified
by their key and api) and the caches were enabled/disabled the same.

In the course of testing, multiple instances of DevicePolicyManager
caches were observed.  Cache performance is better if the caches are
static; making them static will be addressed in b/228452829.

Test:
 * atest FrameworksCoreTests:IpcDataCacheTest
 * atest FrameworksCoreTests:PropertyInvalidatedCacheTests
 * atest FrameworksServicesTests:DevicePolicyConstantsTest
 * atest FrameworksServicesTests:DevicePolicyEventLoggerTest
 * atest FrameworksServicesTests:DevicePolicyManagerServiceMigrationTest
 * atest FrameworksServicesTests:DevicePolicyManagerTest
 * atest FrameworksServicesTests:EnterpriseSpecificIdCalculatorTest
 * atest FrameworksServicesTests:OverlayPackagesProviderTest
 * atest FrameworksServicesTests:OwnersTest
 * atest FrameworksServicesTests:PolicyVersionUpgraderTest
 * atest FrameworksServicesTests:SecurityEventTest
 * atest FrameworksServicesTests:SystemUpdatePolicyTest
 * atest FrameworksServicesTests:TransferOwnershipMetadataManagerTest
 * atest MixedDeviceOwnerTest#testIsDeviceOrganizationOwnedWithManagedProfile
 * atest MixedDeviceOwnerTest#testSetKeyguardDisabledFeatures
 * atest MixedManagedProfileOwnerTest#testIsDeviceOrganizationOwnedWithManagedProfile
 * atest MixedManagedProfileOwnerTest#testNetworkLoggingDelegate
 * atest MixedManagedProfileOwnerTest#testSetKeyguardDisabledFeatures
 * atest OrgOwnedProfileOwnerTest#testIsDeviceOrganizationOwnedWithManagedProfile
 * atest OrgOwnedProfileOwnerTest#testNetworkLoggingDelegate
 * atest OrgOwnedProfileOwnerTest#testSetKeyguardDisabledFeatures
 * atest android.devicepolicy.cts.DevicePolicyManagerTest
 * atest android.devicepolicy.cts.NetworkLoggingTest
 * atest com.android.cts.devicepolicy.DeviceOwnerTest#testAdminActionBookkeeping

Change-Id: I2f4fe4ed25db5fb3100334b9d2ce748ee928c10d
2022-04-11 07:27:16 -07:00
Michael Wright
52f1d5eca6 Merge "DO NOT MERGE Remove PWLE APIs from T" into tm-dev 2022-04-08 10:57:11 +00:00
Eric Biggers
256a0b563f Merge changes Idc218e5f,I26c3fafc am: 7e3c5382cc am: fb4c1822a8 am: 4d4ababae0
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2052056

Change-Id: I6c0ee77edf164ecf5a285afe4dff7cec85e9d668
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-08 02:11:26 +00:00
Eric Biggers
4d4ababae0 Merge changes Idc218e5f,I26c3fafc am: 7e3c5382cc am: fb4c1822a8
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2052056

Change-Id: Ib029dddb2fd26fa33f231b7ae87c3a1fee737a55
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-08 01:36:12 +00:00
Michael Wright
38dc7aa55c DO NOT MERGE Remove PWLE APIs from T
Fixes: 228529016
Test: build
Change-Id: Icfd576f3dff0850f464be32c5a3315e723c3d380
2022-04-07 23:26:18 +00:00
Eric Biggers
bd13f84152 Remove more FDE methods from StorageManager
Now that these methods are no longer called, and none of them are a
public API or have @UnsupportedAppUsage, they can be removed.

inCryptKeeperBounce() actually had one known app user via reflection,
despite the method not having @UnsupportedAppUsage.  However, that user
only made the call if Build.VERSION.SDK_INT < VERSION_CODES.P, so it is
not being used anymore.

Bug: 208476087
Change-Id: Idc218e5f355bb61257b07cf5b5b6df5f4c6ece11
2022-04-07 16:38:36 +00:00
TreeHugger Robot
b6ac4a054b Merge "Parcel: recycle recycles" into sc-v2-dev am: c4ca84a2b3
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17525716

Change-Id: I74935ed1dab8dc6923f58ec237e0884e85380829
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-06 17:15:24 +00:00
Stephanie Bak
73b3dc4fb4 Merge "Expand Javadoc for DISALLOW_WIFI_TETHERING" into tm-dev 2022-04-05 10:13:39 +00:00