Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
895,950 Commits 3 Branches 0 Tags
9a126ddce80f35da5cdfe856df3ef5bb72735355
Commit Graph

895950 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Treehugger Robot
9a126ddce8 Merge changes Ie865aba7,Ic51a9ceb into udc-dev am: 85b959f478 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24134363

Change-Id: I1fa281944e05defe269445ea791742d4db584a31
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-21 21:07:13 +00:00
Songchun Fan
608986bccc [pm] fix SCAN_AS_STOPPED_SYSTEM_APP for restoreDisabledSystemPackage am: 90451b716d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24133051

Change-Id: Ib44854b9a3d4419d2fb6d8d3c5d2c24fe75992ad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-21 21:06:42 +00:00
Treehugger Robot
85b959f478 Merge changes Ie865aba7,Ic51a9ceb into udc-dev 
* changes:
  [pm] do not stop system apps with disabled a launcher activity
  [pm] fix SCAN_AS_STOPPED_SYSTEM_APP for restoreDisabledSystemPackage
 2023-07-21 20:31:40 +00:00
Songchun Fan
e9c83eae3c [pm] do not stop system apps with disabled a launcher activity 
If an app has a disabled/unexported launcher activity, it is effectively
the same as not having a launcher activity. We should not stop such
system apps by default.

BUG: 286459841
Test: manual with a system app that has disabled launcher activity and
verify that it is in the `stopped=false` state after first boot
Test: also tested updating such a system app and verified that it
remains in the un-stopped state after the update is uninstalled

Merged-In: Ie865aba7325e3442c6610ef962fce3a3a65f0b70
Change-Id: Ie865aba7325e3442c6610ef962fce3a3a65f0b70
(cherry picked from commit a1c1f2e29f)
 2023-07-21 18:35:58 +00:00
Chris Li
47f794da52 Merge "Fix Invalid Surface error" into main am: c3199051ac am: a412668aea 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2670876

Change-Id: Ia00e6d464c571d366dee8eb85052b9ababbc5941
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-21 07:53:14 +00:00
Chris Li
a412668aea Merge "Fix Invalid Surface error" into main am: c3199051ac 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2670876

Change-Id: I5bc4f5c897e8d75262c6a6910b8abe24705a3ce6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-21 07:12:11 +00:00
Chris Li
c3199051ac Merge "Fix Invalid Surface error" into main 2023-07-21 06:26:33 +00:00
Chris Li
fa61c1f571 Fix Invalid Surface error 
This is only used for legacy transition, so change it to an error log to
fix the flakiness.

Bug: 242718321
Test: pass existing tests.
Merged-In: Ib2a68f7488724370e44da28bdc30c8db19085889
Change-Id: Ib2a68f7488724370e44da28bdc30c8db19085889
 2023-07-21 12:49:15 +08:00
Julia Reynolds
c57749a767 Allow additional reason/surface combinations for cancel am: 4c39ad7c8f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24147764

Change-Id: Ie6698821c28e7459f928947b7dccce5bc8fe1976
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-20 19:57:45 +00:00
Treehugger Robot
3bfc21bea8 [automerger skipped] Merge "Use -Xjvm-default=all instead of -Xjvm-default=enable or @JvmDefault" into main am: 2e93187332 am: e4de34bd6c -s ours 
am skip reason: Merged-In I473e578b92482fbd6c8812c4d32acc1a4c27a84a with SHA-1 25a05fe4e3 is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2662657

Change-Id: I4bf64a64116907ec6a2cc6fd59275785665c14a9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-20 19:13:13 +00:00
Treehugger Robot
e4de34bd6c Merge "Use -Xjvm-default=all instead of -Xjvm-default=enable or @JvmDefault" into main am: 2e93187332 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2662657

Change-Id: I27954227a029beeff89d4579f6709e0c3b0fc146
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-20 18:06:59 +00:00
Treehugger Robot
2e93187332 Merge "Use -Xjvm-default=all instead of -Xjvm-default=enable or @JvmDefault" into main 2023-07-20 17:21:07 +00:00
Julia Reynolds
4c39ad7c8f Allow additional reason/surface combinations for cancel 
Bubbles log REASON_GROUP_SUMMARY_CANCELED/DISMISSAL_BUBBLE, which wasn't
an allowed combination.

To make this more robust, only look at surface values for REASON_CANCEL,
which is the only reason that needs them. Also, use wtf instead of
exceptions so we can track issues without crashing.

Test: atest NotificationRecordLogger
Fixes: 288516227
Change-Id: I054969dc82da5277002049d063abdb044dcc811e
(cherry picked from commit 80ce161ff1)
Merged-In: I054969dc82da5277002049d063abdb044dcc811e
 2023-07-20 16:41:05 +00:00
Treehugger Robot
e90e8ae640 [automerger skipped] Merge "Handle ArrayIndexOutOfBoundsException for install_sessions.xml" into main am: 89cc2c3b6f am: 343ff810a3 -s ours 
am skip reason: Merged-In I99324e91a2da13bc86d62086aead40cc16cac60b with SHA-1 c23e36b827 is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2609861

Change-Id: Icc7e64fb326de0ef2769e3912e99e2c076272133
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-20 06:41:55 +00:00
Treehugger Robot
343ff810a3 Merge "Handle ArrayIndexOutOfBoundsException for install_sessions.xml" into main am: 89cc2c3b6f 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2609861

Change-Id: I6492b5f05ce96ffc815ff4be5ee7325b98449d50
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-20 06:01:50 +00:00
Treehugger Robot
89cc2c3b6f Merge "Handle ArrayIndexOutOfBoundsException for install_sessions.xml" into main 2023-07-20 05:31:06 +00:00
Colin Cross
fbd05dd7af Use -Xjvm-default=all instead of -Xjvm-default=enable or @JvmDefault 
The @JvmDefault annotation and -Xjvm-default=enable argument are both
removed from kotlinc 1.9.0 in favor of -Xjvm-default=all.

Bug: 291335478
Test: builds
Change-Id: I473e578b92482fbd6c8812c4d32acc1a4c27a84a
Merged-In: I473e578b92482fbd6c8812c4d32acc1a4c27a84a
 2023-07-20 05:17:20 +00:00
Alex Buynytskyy
db7b81b0ba [automerger skipped] More robust tests. am: 2a6cec9647 am: 5162f69948 am: 9c36653159 -s ours am: 7787c0536e -s ours 
am skip reason: Merged-In Id68a28e9dc12f71286e29822d4b88be88ab03653 with SHA-1 2a6cec9647 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24137128

Change-Id: I7e1d8cf3b5a6a71eb0a0698571f555d9628de3c8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-20 03:46:51 +00:00
Alex Buynytskyy
40a21d81bb [automerger skipped] More robust tests. am: 2a6cec9647 am: ff5384f85c -s ours am: d1a8496de5 -s ours 
am skip reason: Merged-In Id68a28e9dc12f71286e29822d4b88be88ab03653 with SHA-1 18e9fa7232 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24137128

Change-Id: I16e59ee7ecf566930fe7cc40706f28282ae18e55
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-20 03:46:13 +00:00
Alex Buynytskyy
7787c0536e [automerger skipped] More robust tests. am: 2a6cec9647 am: 5162f69948 am: 9c36653159 -s ours 
am skip reason: Merged-In Id68a28e9dc12f71286e29822d4b88be88ab03653 with SHA-1 2a6cec9647 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24137128

Change-Id: I7a10f57b71b3d37c53b7afabae2a6481cfa07494
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-20 03:45:59 +00:00
Alex Buynytskyy
d1a8496de5 [automerger skipped] More robust tests. am: 2a6cec9647 am: ff5384f85c -s ours 
am skip reason: Merged-In Id68a28e9dc12f71286e29822d4b88be88ab03653 with SHA-1 18e9fa7232 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24137128

Change-Id: Ia4a207bb64706ec617fef5a60fafbb729a0e2ac4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-20 03:05:08 +00:00
Alex Buynytskyy
9c36653159 More robust tests. am: 2a6cec9647 am: 5162f69948 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24137128

Change-Id: Id042ef153ac44536aeaba8ed9ec82b9cd5e75211
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-20 03:00:00 +00:00
Alex Buynytskyy
5162f69948 More robust tests. am: 2a6cec9647 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24137128

Change-Id: I37681c65666fb452deb992211b2ac3262b6138a6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-20 02:17:35 +00:00
Alex Buynytskyy
ff5384f85c More robust tests. am: 2a6cec9647 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24137128

Change-Id: Iec05a7e1afd541157eebda56bda87deeb870de7a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-20 02:15:19 +00:00
Treehugger Robot
a45f3babbf Merge "Fix at-clause typo for Handler." into main am: 9f086e5d7a am: 1837a51fd1 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2666076

Change-Id: I9e1358be20681b7d736371bf9283b1bcfa7e7491
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-20 01:28:12 +00:00
Treehugger Robot
1837a51fd1 Merge "Fix at-clause typo for Handler." into main am: 9f086e5d7a 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2666076

Change-Id: I8b8e742aa1191cc8814322d6b4af790edfeca45a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-20 00:47:03 +00:00
Wale Ogunwale
858c15eba4 Merge "Clean up postWindowRemoveStartingWindowCleanUp" into udc-dev am: 050f26ee5e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23736106

Change-Id: I2c49bb251746fe620b69f034042b2e14d9a2134f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-20 00:43:23 +00:00
Wale Ogunwale
050f26ee5e Merge "Clean up postWindowRemoveStartingWindowCleanUp" into udc-dev 2023-07-20 00:13:59 +00:00
Treehugger Robot
9f086e5d7a Merge "Fix at-clause typo for Handler." into main 2023-07-20 00:06:58 +00:00
TreeHugger Robot
b4a5e0e9d1 Merge "Use -Xjvm-default=all instead of -Xjvm-default=enable or @JvmDefault" into udc-dev-plus-aosp 2023-07-19 23:51:09 +00:00
Lee George Thomas
3a7fca8e8e [automerger skipped] Merge "Signal lmkd to start psi monitoring after boot." into main am: f5a8cbd2bd am: ea7c79d8ba -s ours 
am skip reason: Merged-In Iee5cecdae54304b092c6a1801f3814e13a919be2 with SHA-1 77c0b5a05f is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2650783

Change-Id: Id33345587a502eb5449cded52c30d81ea4d00960
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-19 23:36:47 +00:00
Lee George Thomas
ea7c79d8ba Merge "Signal lmkd to start psi monitoring after boot." into main am: f5a8cbd2bd 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2650783

Change-Id: I3893b86c4da5d7f0bb1388f63f85fb2bd61e3716
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-19 22:57:50 +00:00
Bart Sears
590cea0a03 Merge "Update to cold launch if the process is restarted during launching" into udc-dev am: 15371249b6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24126185

Change-Id: I5dd3197cc6cad2bfecf93900a2922d569a27e33c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-19 22:52:24 +00:00
Lee George Thomas
f5a8cbd2bd Merge "Signal lmkd to start psi monitoring after boot." into main 2023-07-19 22:28:24 +00:00
Alex Buynytskyy
2a6cec9647 More robust tests. 
https://android-build.corp.google.com/test_investigate/?invocationId=I89000010151050377&testResultId=TR75528603005220067

Bug: 290699552
Test: atest PackageManagerTests

Merged-In: Id68a28e9dc12f71286e29822d4b88be88ab03653
Change-Id: Id68a28e9dc12f71286e29822d4b88be88ab03653
(cherry picked from commit 18e9fa7232)
 2023-07-19 22:22:09 +00:00
Bart Sears
15371249b6 Merge "Update to cold launch if the process is restarted during launching" into udc-dev 2023-07-19 22:08:46 +00:00
Songchun Fan
90451b716d [pm] fix SCAN_AS_STOPPED_SYSTEM_APP for restoreDisabledSystemPackage 
Use ParsedPackage to directly check if the package has a launcher entry
or not. This way, we can unify the system-apps-stopped code path for
1) installing new system apps after an OTA, and 2) restoring disabled system
apps after uninstalling the update.

BUG: 286459841
Test: manual with a system app that doesn't have a launcher entry
Test: also manually checked that a system app with a launcher entry will
be stopped by default

Merged-In: Ic51a9ceb7db6d887cebc390bb2878db8810cddbf
Change-Id: Ic51a9ceb7db6d887cebc390bb2878db8810cddbf
(cherry picked from commit c3415b9f2f)
 2023-07-19 22:04:43 +00:00
Lais Andrade
071d090939 Merge "Update owners for VibratorPerfTest" into main am: 1e44213dce am: 2eb791b5b9 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2665795

Change-Id: Ib75edfb00f3ec03f8b56b7a76a4d645caaf28a8c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-19 21:48:36 +00:00
Colin Cross
25a05fe4e3 Use -Xjvm-default=all instead of -Xjvm-default=enable or @JvmDefault 
The @JvmDefault annotation and -Xjvm-default=enable argument are both
removed from kotlinc 1.9.0 in favor of -Xjvm-default=all.

Bug: 291335478
Test: builds
Change-Id: I473e578b92482fbd6c8812c4d32acc1a4c27a84a
Merged-In: I473e578b92482fbd6c8812c4d32acc1a4c27a84a
 2023-07-19 14:33:40 -07:00
Lais Andrade
2eb791b5b9 Merge "Update owners for VibratorPerfTest" into main am: 1e44213dce 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2665795

Change-Id: I11f227a561c34bb6aa8b83af979dceb0f0146efd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-19 21:03:28 +00:00
Automerger Merge Worker
3e4cb76551 Merge "Merge "NativeCryptoInfo: fix ctor invocation" into main am: 1f108e0203 am: 7c4ae57f9c" into udc-dev-plus-aosp 2023-07-19 20:41:24 +00:00
Treehugger Robot
462a09b6cf Merge "NativeCryptoInfo: fix ctor invocation" into main am: 1f108e0203 am: 7c4ae57f9c 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2652628

Change-Id: I146080c82acc91e986abce840f86d6a1128648bc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-19 20:40:37 +00:00
Austin Wang
671e39e906 Merge "RESTRICT AUTOMERGE Center align the lock screen wallpaper" into udc-dev am: 6ff853d894 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24104093

Change-Id: Iab8290ddaa363738f5d06740c71ce2ff986bb51d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-19 20:40:21 +00:00
Austin Wang
b3e1d7b114 RESTRICT AUTOMERGE Center align the lock screen wallpaper am: c9e25a5d5f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24104093

Change-Id: Ibbd8b23751d0bbe2b7b393a5ead9254ed0edba8b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-19 20:39:50 +00:00
Lais Andrade
1e44213dce Merge "Update owners for VibratorPerfTest" into main 2023-07-19 20:24:11 +00:00
Austin Wang
6ff853d894 Merge "RESTRICT AUTOMERGE Center align the lock screen wallpaper" into udc-dev 2023-07-19 20:01:28 +00:00
Treehugger Robot
7c4ae57f9c Merge "NativeCryptoInfo: fix ctor invocation" into main am: 1f108e0203 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2652628

Change-Id: Ia9237e06db6d58dda062bafcefc4cb70ccb4135a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-19 19:57:15 +00:00
Lee George Thomas
816b3904d3 Merge "Signal lmkd to start psi monitoring after boot." into udc-dev-plus-aosp 2023-07-19 19:42:55 +00:00
Mateus Azis
9ee4a78bcb Fix at-clause typo for Handler. 
The documentation had a typo (missing "@") and would not render some
links correctly. See: https://developer.android.com/reference/android/os/Handler?hl=en#Handler()

Change-Id: I55333133f130736271c6550b0e8fba7e485ef933
 2023-07-19 12:04:05 -07:00
Treehugger Robot
1f108e0203 Merge "NativeCryptoInfo: fix ctor invocation" into main 2023-07-19 18:31:49 +00:00