Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
796,399 Commits 3 Branches 0 Tags
2ff395efe244f6d128cccf0cd4499cc29aa2b19a
Commit Graph

10616 Commits

Author SHA1 Message Date
Cole Faust
9b3a5fc03b Merge "Fix array-related errorprone warnings" am: a1eb8cf128 am: 44f8576073 am: 91d6c5b564 am: 6a79ae2567 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2186016

Change-Id: I7052a1f7391ed6701fe0e1036c27368609032e35
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-30 20:44:00 +00:00
Cole Faust
91d6c5b564 Merge "Fix array-related errorprone warnings" am: a1eb8cf128 am: 44f8576073 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2186016

Change-Id: Icfb700330d9a9cd0a592b76c9e4cf4a8bcd19c30
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-30 19:01:56 +00:00
Neha Jain
1854f26ff1 Merge "Revert "Remove BatteryStats user activity types and use PowerManager ones instead."" into tm-qpr-dev am: 900e693d58 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19734803

Change-Id: Ib9db2a5899906b4799708dd92d1ef436c043f3c5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-26 00:59:32 +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
Cole Faust
584140c83a Fix array-related errorprone warnings 
The ArrayEquals, ArrayHashCode, ArrayToString, and
ArraysAsListPrimitiveArray errorprone findings were
demoted from errors to warnings. Fix existing
occurrences of them so they can be made errors again.

Bug: 242630963
Test: RUN_ERROR_PRONE=true m javac-check
Change-Id: Ia6f216cc36ad0a5758f39fd9b34962cd4adf9d8e
 2022-08-25 10:57:12 -07:00
Anna Bauza
386f5f2ce6 Merge "Add Android Multiuser Atom which will contain number of supported users." into tm-qpr-dev am: 661265f485 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19715873

Change-Id: I408738843e8700293d77dd1d41a415e98581b1b8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-24 18:20:38 +00:00
Philip Junker
80068f1721 Merge "Remove BatteryStats user activity types and use PowerManager ones instead." into tm-qpr-dev am: 28930b91d8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19674343

Change-Id: Ie5403d7839b0104af9e01b9580dd7dc424165343
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-23 20:44:56 +00:00
Oli Lan
fb1ae8298a Merge "Check for null application context in UserManager." into tm-qpr-dev am: 109ae7874c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19459093

Change-Id: I1007c9bffb74335d73ca36e34de9ac7939baa3b0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-23 20:30:29 +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
Steven Moreland
a64ec98da3 Merge "Reword ambiguous documentation in Parcel" am: c2bd9f481f am: 231c243d45 am: 4783db4155 am: 487f6885e5 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2171073

Change-Id: I70350af88cba7c17ac010b0eaa89169f42a000cd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-02 21:26:55 +00:00
Steven Moreland
4783db4155 Merge "Reword ambiguous documentation in Parcel" am: c2bd9f481f am: 231c243d45 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2171073

Change-Id: I1a75c9e770366cd12c11358a89bda0d594f2e9d0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-02 20:56:38 +00:00
Steven Moreland
231c243d45 Merge "Reword ambiguous documentation in Parcel" am: c2bd9f481f 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2171073

Change-Id: I645b073414031d43a90b097fc9454476b77ec0c3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-02 20:39:26 +00:00
danielzhang130
c63f3f259c Reword ambiguous documentation in Parcel 
- original documentation for Parcel.unmarshall could be understood
  both ways: Parcel written with bytes of data, data written with
  bytes of Parcel

Test: Not applicable
Signed-off-by: danielzhang130 <danielzhang130@gmail.com>
Change-Id: I9afd3ae66ca03f391b272ac0524593395ffe53fa
 2022-08-01 23:47:47 +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
Victor Chang
d3fb6ef1a4 Merge "Deprecate Debug.enableEmulatorTraceOutput()" am: 3f007c4dea am: b0bbe9b5f3 am: fd818a3610 am: 27f8e8943b 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2154934

Change-Id: Ie3ce9234b41dc9b32a2f97a70298f6cf6dd8e744
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-20 11:39:04 +00:00
Victor Chang
fd818a3610 Merge "Deprecate Debug.enableEmulatorTraceOutput()" am: 3f007c4dea am: b0bbe9b5f3 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2154934

Change-Id: I73022c7c3840483af31390c297ded5d904de51fa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-20 10:41:35 +00:00
Victor Chang
b0bbe9b5f3 Merge "Deprecate Debug.enableEmulatorTraceOutput()" am: 3f007c4dea 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2154934

Change-Id: I254df58123db32e542a75176544313776c55d20b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-20 10:23:51 +00:00
Victor Chang
3f007c4dea Merge "Deprecate Debug.enableEmulatorTraceOutput()" 2022-07-20 09:57:40 +00:00
Victor Chang
6ec9edf868 Deprecate Debug.enableEmulatorTraceOutput() 
The API has been no-op for 2 releases.
https://r.android.com/1352354

We should officially deprecate the API.

Bug: 238895989
Test: atest CtsOsTestCases:android.os.cts.DebugTest
Change-Id: Ib1454b200a0ae0da557de02c49c482145deb97df
 2022-07-15 11:38:38 +01:00
Steven Moreland
6c700dd35a Merge "Binder: clearCallingIdentity is kernel binder" am: bc67752894 am: eddf8c7625 am: 4b295a3e22 am: e43b9a5748 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2147360

Change-Id: I32d921041e0109f90e5b0627a11e8c1bd9c812b7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-07 01:20:32 +00:00
Steven Moreland
4b295a3e22 Merge "Binder: clearCallingIdentity is kernel binder" am: bc67752894 am: eddf8c7625 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2147360

Change-Id: I331269726340c8d83d4486123743bdace740ddd3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-07 00:46:43 +00:00
Steven Moreland
eddf8c7625 Merge "Binder: clearCallingIdentity is kernel binder" am: bc67752894 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2147360

Change-Id: Ic6643d23d94fe5673243c46663a3ac7a42235734
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-07 00:26:42 +00:00
Steven Moreland
5d7100a43b Binder: clearCallingIdentity is kernel binder 
This method clears the calling identity of a kernel
binder call. However, there is now a generic API to
disallow the use of kernel binder calling identities.
This is used by RPC binder calls in order to ensure
that code doesn't accidentally assume the default
(<pid>, <uid>) calling identity means that the call
originated from another process.

In the C++ layer, this API is attached to
IPCThreadState. In the future, we could consider
expanding the scope of this API to code and restore
many types of calling IDs, but the current return
type may not have enough space, and I want to
push people away from thread locals (globals)
for now.

Bug: 237245600
Test: N/A
Change-Id: I6e293814769cbd3c41e72afd95385af31ceb099f
 2022-07-06 21:48:46 +00:00
Hani Kazmi
48e0ac1311 Merge "Parcel.java: Fix bug where non-nested creators threw NullPointer" am: 97211945a8 am: 715e417609 am: d74c99a05f am: 5005c4a93d 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2139755

Change-Id: I92798cf63fdff3ea5163137740286a2e1b66ad2b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-05 12:18:03 +00:00
Hani Kazmi
d74c99a05f Merge "Parcel.java: Fix bug where non-nested creators threw NullPointer" am: 97211945a8 am: 715e417609 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2139755

Change-Id: I5b2d68cebbff65183c9c854d43bd1da817fe8eea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-05 11:36:59 +00:00
Hani Kazmi
715e417609 Merge "Parcel.java: Fix bug where non-nested creators threw NullPointer" am: 97211945a8 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2139755

Change-Id: I0c74786d36b73d8c7812750dac5b6af55fb96ff9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-05 11:11:31 +00:00
Hani Kazmi
03c34f57c0 Parcel.java: Fix bug where non-nested creators threw NullPointer 
Upon deserialization, various APIs would check that the passed in class
was assignable from the creator's enclosing class - which was assumed to
always be the Parcelable type.

This assumption is not always true, so updating the check to explicitely
store the parcelable type

Fix: 232589966
Test: m && atest ParcelTest && atest BundleTest
Change-Id: I59b650a854944e9020615a65798c5e54f5540aaa
 2022-06-30 13:04:11 +00:00
Hani Kazmi
ace5dfd5d1 Merge "BaseBundle.java: Adding tests for 'Recycle underlying parcel for bundle'" into tm-dev am: 6b07af5e83 am: c388f2b9d0 am: ad4244ec44 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18929334

Change-Id: I6885f5c782117963028be3404ce49dbf0f8b8697
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-29 11:58:43 +00: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
bfa7ecc279 Merge "BaseBundle.java: Adding tests for 'Recycle underlying parcel for bundle'" into tm-dev am: 6b07af5e83 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18929334

Change-Id: I5f81f71ccdd368a37653e31399d435570870350f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-29 10:58:29 +00:00
Xin Li
14543d1ec7 Merge tm-dev-plus-aosp-without-vendor@8763363 
Bug: 236760014
Merged-In: I5705ac7586cb73b7bc2bd60bb792d0a0a951ed74
Change-Id: I59a4fd917c95c8c9e258cd743cee2d950a46d9cd
 2022-06-28 21:24:28 +00:00
Treehugger Robot
16f0c1c426 Merge "Update VibrationAttributes javadocs for FLAG_BYPASS_INTERRUPTION_POLICY" am: c3560c6c68 am: fb98ab119d am: 1c88dd6b6d am: 27ea0bba2e 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2133773

Change-Id: I8839c903b24dcdf67fb6e1a526489980dad67e67
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-27 20:00:59 +00:00
Steven Moreland
6db478c840 Merge "Parcel: better debug recycle" 2022-06-24 21:53:32 +00:00
Steven Moreland
710f817286 Parcel: better debug recycle 
Detect recycle called twice always (and when DEBUG_RECYCLE is on, we
detect recycle called twice or called zero times, and we show a stack).

Bug: 231799394
Test: manual (calling recycle twice)
Change-Id: I1dd9f392ee916edd9c598085a1c19dbdd3ce957f
Merged-In: I1dd9f392ee916edd9c598085a1c19dbdd3ce957f
 2022-06-24 20:43:45 +00:00
Treehugger Robot
1c88dd6b6d Merge "Update VibrationAttributes javadocs for FLAG_BYPASS_INTERRUPTION_POLICY" am: c3560c6c68 am: fb98ab119d 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2133773

Change-Id: I46739270ddbd6d5b7354bfa4878be1fabad52835
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-24 19:35:42 +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
Lais Andrade
2d6c839d89 Update VibrationAttributes javadocs for FLAG_BYPASS_INTERRUPTION_POLICY 
Add clarification that this flag can only be applied by privileged apps, and will be ignored otherwise.

Bug: 236932598
Change-Id: I78db484b9d479abed67689c827707b6f141b2c00
Test: N/A
 2022-06-23 13:13:42 +00:00
Chris Wailes
80f33ec0a9 Merge "Add System Properties based settings for USAPs" am: a2143c07bb am: 6cb0a4dd92 am: ca5df431c5 am: 8b193879c6 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2043395

Change-Id: Icdf31b641bec9b3f39591586086640868c30f9ec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-21 23:45:53 +00:00
Steven Moreland
0812da1a82 Merge "Parcel: better debug recycle" into tm-dev-plus-aosp am: fc6b6d35b4 am: 19ea3d8b46 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18973047

Change-Id: Iaaadfdf50a3420261226a6fe7d7bddcd5396620e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-21 23:45:21 +00:00
Chris Wailes
ca5df431c5 Merge "Add System Properties based settings for USAPs" am: a2143c07bb am: 6cb0a4dd92 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2043395

Change-Id: I98e8a58abbbc5ac8ba5b8caad4dcb365495209c3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-21 23:08:53 +00:00
Steven Moreland
00fe31defd Parcel: better debug recycle 
Detect recycle called twice always (and when DEBUG_RECYCLE is on, we
detect recycle called twice or called zero times, and we show a stack).

Bug: 231799394
Test: manual (calling recycle twice)
Change-Id: I1dd9f392ee916edd9c598085a1c19dbdd3ce957f
 2022-06-17 19:32:23 +00:00
Chris Wailes
e05e1ffffe Add System Properties based settings for USAPs 
This CL updates the configuration handling for USAP system properties.

Test: Build; flash; set property; check device state
Bug: 161725679
Change-Id: Ia1f6c4f4f7b8798d9c906953629bed61ce618f54
 2022-06-17 10:49:17 -07:00
Xin Li
195b02b570 Merge "Merge Android 12 QPR 3" 2022-06-16 18:51:54 +00:00
Jooyung Han
fab0dc0d32 Merge "Unhide Parcel.writeTypedList() with additional flag" am: a4d51305f7 am: 2f831b08ca am: dc9b9f6d83 am: 92b6b4d408 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2107830

Change-Id: If621d256967d1b335cd8ae138c38b42650b94f0c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-15 15:43:58 +00:00
Jooyung Han
dc9b9f6d83 Merge "Unhide Parcel.writeTypedList() with additional flag" am: a4d51305f7 am: 2f831b08ca 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2107830

Change-Id: I1e24dc9b7d861bf77fd90f25a9184fa5f4be9dd1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-15 15:07:54 +00:00
Hani Kazmi
34b061c00a Merge "BaseBundle.java: Recycle underlying parcel when bundle is cleared." 2022-06-15 09:51:53 +00:00
Jooyung Han
2f831b08ca Merge "Unhide Parcel.writeTypedList() with additional flag" am: a4d51305f7 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2107830

Change-Id: If36533484f1f90c57b6799d086fa5e9b7beba35e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-15 01:32:14 +00:00