Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
765,404 Commits 3 Branches 0 Tags
d4b424edebc02df2bcc5fe2172a7047175369617
Commit Graph

18889 Commits

Author SHA1 Message Date
TreeHugger Robot
5434f98a11 Merge "BatteryStatsImpl: Add parcel methods for DisplayBatteryStats." into tm-dev-plus-aosp 2022-06-22 00:12:27 +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
Shumao Hou
e57b8c1749 BatteryStatsImpl: Add parcel methods for DisplayBatteryStats. 
DisplayBatteryStats didn't have parcel methods and the estimated
multidisplay screen power was always initialized from 0.
The estimated screen power of the app will become inaccurate
after rebooting.

Bug: 235321975
Test: manual test.
1. Unplug the device.
2. Use an app for a while and keep screen on.
3. Capture the first bug report.
4. Reboot the device.
5. Capture the second bug report.
The estimated screen power of the app shouldn't become lower after rebooting the device.

Author: Shumao Hou <shumao1129@gmail.com>
Change-Id: If74e285102a7350c17c2fc40a205b2031e82f5f4
(cherry picked from commit 79c3779bb1)
 2022-06-21 20:57:40 +00:00
Vadim Caen
b38e19fdc3 Merge "Prevent callback registration when back flag is disabled" into tm-dev am: 1c6de844ce 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18794217

Change-Id: I8054556537104bb80d940272b367ed9b8ffa520c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-20 21:02:34 +00:00
Vadim Caen
a2e45f1ed1 Prevent callback registration when back flag is disabled 
When the enableOnBackInvokedCallback is set to false (or not set),
registering an OnBackInvokedCallback should be a no-op to avoid
overriding the default compat callback.

Test: Manual testing registering a callback on an app with the flag
disabled and doing a back gesture. Currently we don't have test
executing a back gesture so automated tests are not possible

Bug: 235206960

Change-Id: I54d843f11130a78ed5a68cbe4722e601a2086ee1
Merged-In: I54d843f11130a78ed5a68cbe4722e601a2086ee1
(cherry picked from commit aa48dc3c2d)
 2022-06-20 11:40:18 +02: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
Hui Yu
b8f5fadbf7 Merge "Fix the missing history event problem." into tm-dev am: 25019b3782 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18582121

Change-Id: If5c508f866cec2c22cb534ae20da06dade629438
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-16 18:05:34 +00:00
Hui Yu
25019b3782 Merge "Fix the missing history event problem." into tm-dev 2022-06-16 18:03:26 +00:00
huiyu
ae5e234cec Fix the missing history event problem. 
[ag/8009931 is to fix the missing event problem and it get reverted in ag/15961577.
Now revert the change that causes the problem.]

Make a copy of mHistoryCur and add the copy to history buffer after
starting a new history file.

Bug: 230799882
Test: ag/8009931 reproduce steps.
Change-Id: If9339ed5182b65b9c59c119894e4f317b2e5751c
 2022-06-15 12:55:09 -07:00
Treehugger Robot
4ecafadd7b Merge "statemachine migration from base to modules-utils" am: 51e6e8a0e1 am: 8cc1782ba5 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1893671

Change-Id: I5ba9d65a7223fbf9d1f371e672491f09b05c1940
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-15 01:25:27 +00:00
Treehugger Robot
8cc1782ba5 Merge "statemachine migration from base to modules-utils" am: 51e6e8a0e1 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1893671

Change-Id: Ica83696aafc34e98de5a8a90838bb4b6a92ac58c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-15 00:59:17 +00:00
Treehugger Robot
f510d4e024 Merge "Add runtime crash information to sysprops" am: 68f657619c am: 0a3e8a46af 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2107991

Change-Id: Ib5c224cd8192d883977d001a56194f8f8584e9ed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-15 00:40:26 +00:00
Treehugger Robot
51e6e8a0e1 Merge "statemachine migration from base to modules-utils" 2022-06-14 23:52:11 +00:00
Treehugger Robot
0a3e8a46af Merge "Add runtime crash information to sysprops" am: 68f657619c 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2107991

Change-Id: Ia6e09648c74410ce5d14dd6b2032e59466034cb5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-14 22:58:00 +00:00
Treehugger Robot
68f657619c Merge "Add runtime crash information to sysprops" 2022-06-14 22:28:58 +00:00
Matt Casey
5f3b7d655f Merge "Finish mini-resolver after user action." into tm-dev am: 831370bffb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18838611

Change-Id: I51f844182e43db1ebe3c50a543ea04f499943fed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-13 16:03:03 +00:00
Matt Casey
831370bffb Merge "Finish mini-resolver after user action." into tm-dev 2022-06-13 15:46:13 +00:00
Yurii Zubrytskyi
4226e4b4e4 Merge changes from topic "Tiramisu-SDK-Finalization-revert-hack" into tm-dev am: 120aa88d0d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18764290

Change-Id: Ic040b07c1559829833a4998f5001b8f34267c9a8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-11 08:19:12 +00:00
Yurii Zubrytskyi
120aa88d0d Merge changes from topic "Tiramisu-SDK-Finalization-revert-hack" into tm-dev 
* changes:
  Catch parsing errors for pre-release platforms
  Revert "HACK: allow apps with pre-release SDK RESTRICT AUTOMERGE"
 2022-06-11 05:42:37 +00:00
Matt Casey
5b015f84af Finish mini-resolver after user action. 
Bug: 235440512
Test: Trigger mini resolver, press each button and press back and verify
      the resolver is gone.
Change-Id: Ib22f7f38b4c5f7143b5898dbc3c74e3c7a0450f3
 2022-06-10 18:06:18 +00:00
Daniel Sandler
a95ab05e3a Merge "Android 1<3." into tm-dev am: 0f8269e68e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18819106

Change-Id: Id245d8b53ae63dc7e47f1812528513e42b390312
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-10 01:43:24 +00:00
Daniel Sandler
0f8269e68e Merge "Android 1<3." into tm-dev 2022-06-10 01:19:44 +00:00
Dan Sandler
2c57c9c164 Android 1<3. 
Fixes: 216297617
Test: adb shell am start -n android/com.android.internal.app.PlatLogoActivity
      adjust clock to 13:00
      for a bonus, long press on the bubbles
Change-Id: I3d32d452c6dd7a7e69aad86a033aba09ae8625d5
 2022-06-09 12:54:27 -04:00
William Escande
358a664344 statemachine migration from base to modules-utils 
Bug: 198418216
Tag: #refactor
Test: atest ModulesUtilsTests
Test: atest FrameworksUtilTests
Merged-In: I65303c131f6e867f6c44d14baa537560fa8bf857
Change-Id: I65303c131f6e867f6c44d14baa537560fa8bf857
 2022-06-08 21:15:14 +00:00
TYM Tsai
cd43f8064c Merge "Fix unbind crash in AbstractRemoteService." into tm-dev am: dc9db874ba 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18691109

Change-Id: I727b2114ac409a1f33ed92277be4189e45270a77
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-07 16:19:31 +00:00
TYM Tsai
dc9db874ba Merge "Fix unbind crash in AbstractRemoteService." into tm-dev 2022-06-07 16:00:13 +00:00
Yurii Zubrytskyi
bb146e1b71 Catch parsing errors for pre-release platforms 
In cases when a parsed APK is built with a pre-release platform
(e.g. Tiramisu for 33) our generic parsing code may not fail, as
it is called for user packages as well, and a single bad package
may disable the whole device.

Bug: 233398506
Test: presubmits

Change-Id: I7f93176efceac94b0768d0e4d5be1c28ccce23e3
 2022-06-06 15:00:44 -07:00
Mark Renouf
f89b28c4c6 Merge "Fix crash in DisplayResolveInfo writeToParcel impl" into tm-dev am: 08a70e40fb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18715227

Change-Id: I62b7d51c4186e9e17da9539fadc6eeabc22a31e9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-04 12:38:25 +00:00
Mark Renouf
08a70e40fb Merge "Fix crash in DisplayResolveInfo writeToParcel impl" into tm-dev 2022-06-04 12:13:21 +00:00
Mark Renouf
9d5f710317 Fix crash in DisplayResolveInfo writeToParcel impl 
This fixes an incorrect use of List.toArray() leading to a crash

When passed no arguments, toArray returns an Object[] and not T[],
hence the unchecked cast will throw ClassCastException when this is run.

This change cleans up the parcelable implementation by replacing
writeParcelableArray with writeTypedList, which is more efficient and
avoids the conversion to/from an array entirely.

Bug: 200347466
Test: Take screenshot, tap share, long press an app, short press power
Change-Id: I225664c8709502c7e45ac06c2858c0c5ac0b7506
 2022-06-03 19:50:38 +00:00
Iris Yang
3dfec49ea8 Merge "Wire display context for text toasts" into tm-dev am: ca6ef9125d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18660549

Change-Id: I50ed33505cfa726cab10348ee352bfce702db08b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-03 03:16:29 +00:00
Iris Yang
ca6ef9125d Merge "Wire display context for text toasts" into tm-dev 2022-06-03 02:58:01 +00:00
TreeHugger Robot
bf40a305ae Merge "Update fgs manager message and remove dot" into tm-dev am: bba9932a6b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18705774

Change-Id: I6dd4241fad27835c6f93b3b3598efa2318ad6c8c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-02 05:22:51 +00:00
TreeHugger Robot
bba9932a6b Merge "Update fgs manager message and remove dot" into tm-dev 2022-06-02 05:18:03 +00:00
Evan Severson
280ea9072d Update fgs manager message and remove dot 
Test: Build and start a foreground service
Fixes: 234476539
Change-Id: Ib85f68e5517498c3e6441d246cc9b3feb1c5de1d
 2022-06-01 17:45:21 -07:00
Matt Casey
913908c1ad Merge "Fix ResolverDrawerLayout child measurement" into tm-dev am: a834a9bd52 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18625112

Change-Id: I52d01f5563887e911617744bd523fed3c84b7398
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-01 19:42:25 +00:00
Matt Casey
a834a9bd52 Merge "Fix ResolverDrawerLayout child measurement" into tm-dev 2022-06-01 19:03:44 +00:00
Vadim Caen
e199288f63 Merge "Transfer the actual dispatcher when the window is preserved" into tm-dev am: a147b66f61 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18601925

Change-Id: I34b3da192b4cf72d170e0058b8265ec4260cb235
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-01 15:15:46 +00:00
Vadim Caen
a147b66f61 Merge "Transfer the actual dispatcher when the window is preserved" into tm-dev 2022-06-01 14:35:57 +00:00
Iris Yang
c0055b9b7b Wire display context for text toasts 
Toast doesn't work correctly for multi-display. When default display's
screen off, the toast wouldn't be able to show on secondary display.
Without this change, default display screen state will cause text toasts
doesn't correctly show up.

Bug: 233717651
Test: atest ToastUITest
Change-Id: I1705bc71062fa28c378bf7cc02d104c0f53ce865
 2022-06-01 11:28:15 +08:00
junyulai
8b3b5463e8 [MS82.2] Add a rewriteSingle method that takes two timestamps am: 807a7f37f0 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2063311

Change-Id: I0eef3ba0f1385fabfbf9d60349ed2ba8787e9e4a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-01 03:19:55 +00:00
Natasha Lee
29c927e4e7 Merge changes from topic "stats-migration" 
* changes:
  Add null check when list directory
  [MS82.2] Add a rewriteSingle method that takes two timestamps
 2022-06-01 03:03:02 +00:00
Ahaan Ugale
67815e4fd8 Fix unbind crash in AbstractRemoteService. 
Crashes if there's an attempt to unbind when the service isn't already
bound. It's unclear which service is triggering this code path though.

Fix: 230543089
Change-Id: Ia108c709ed3c82ca18e581b464c963d52e108a3e
 2022-06-01 02:07:17 +00:00
Matt Casey
d68f10b2f7 Merge "Fix Chooser enter transition animation" into tm-dev am: 8d5bcaa534 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18609372

Change-Id: I6ff40552079bc8b47f1f047982b897b1b5c46345
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-01 01:25:29 +00:00
Matt Casey
8d5bcaa534 Merge "Fix Chooser enter transition animation" into tm-dev 2022-06-01 01:13:49 +00:00
Robert Horvath
b8dbb51759 Merge changes from topic "privacy-type-media-projection" into tm-dev am: d59d17d74a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18375274

Change-Id: I03c6e7abd4245653accc4a2fa1a472861dd4f0f0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-30 18:07:18 +00:00
Robert Horvath
d59d17d74a Merge changes from topic "privacy-type-media-projection" into tm-dev 
* changes:
  Add MediaProjection privacy item type
  Extract privacy item monitoring interface, add AppOpsPrivacyItemMonitor
 2022-05-30 17:43:32 +00:00
James O'Leary
4177945503 Match Android's colors to design intent am: c3cffc8bb6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18581096

Change-Id: I0c82674b34177843e47e21582c68697422c6f949
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-27 16:50:09 +00:00
James O'Leary
f5fff77bf8 Merge changes from topic "themesMay2322" into tm-dev 
* changes:
  Update ColorScheme.toString() formatting
  Match latest variant spec; update hue rotation logic
  Match Android's colors to design intent
 2022-05-27 16:40:18 +00:00