Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
842,000 Commits 3 Branches 0 Tags
3ca950724ccb01a0371ba16ffd8ee74affcb365f
Commit Graph

24368 Commits

Author SHA1 Message Date
Lee Shombert
f4faa5b66b Merge "Revert "Fix concurrency issue in PropertyInvalidatedCache"" 2022-10-14 17:40:23 +00:00
Lee Shombert
c91a3beb6a Revert "Fix concurrency issue in PropertyInvalidatedCache" 
This reverts commit 423848fe8a.

Reason for revert: http://b/253636168 Broken test: FrameworksCoreTests(module-abi=x86_64) on git_master on cf_x86_64_phone-userdebug at 9173922

Change-Id: Ica6736b5192b1a70d4a4d9509736ea0268fb2286
 2022-10-14 17:11:48 +00:00
András Kurucz
5719bdc975 Merge "Update Action button order in CallStyle Notifications" into tm-qpr-dev am: e58df67a4f am: 2818c6c33c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20089448

Change-Id: I93de7cc293e4d84ce3c9b9fca540e28e719e7dd5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-14 15:54:11 +00:00
András Kurucz
2818c6c33c Merge "Update Action button order in CallStyle Notifications" into tm-qpr-dev am: e58df67a4f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20089448

Change-Id: I88d2e7649cc2df9ef41319807e71fdd7122d7a10
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-14 15:22:33 +00:00
András Kurucz
e58df67a4f Merge "Update Action button order in CallStyle Notifications" into tm-qpr-dev 2022-10-14 15:00:06 +00:00
Lee Shombert
51db28630f Merge "Fix concurrency issue in PropertyInvalidatedCache" 2022-10-13 22:08:25 +00:00
Lee Shombert
423848fe8a Fix concurrency issue in PropertyInvalidatedCache 
Bug: 253063488

Ensure the global lock is held while fetching the list of active
caches.  The global lock is necessary while the list is being fetched;
it is not necessary while each cache in the list is cleared.

Added a new test for PropertyInvalidatedCache.onTrimMemory().  This
test will not catch race conditions but does verify that
onTrimMemory() behaves as expected.

Added an entry to TEST_MAPPING so that the PropertyInvalidatedCache
tests run when the source file is modified.

Test: atest
 * FrameworksCoreTests:PropertyInvalidatedCacheTests

Change-Id: Ib3ef355c88cb272334ccfc16f922c057828749ce
 2022-10-13 11:20:22 -07:00
Jay Sullivan
5a671d6a92 Merge "Fix startOpNoThrow argument annotation" 2022-10-13 17:39:39 +00:00
Joanne Chung
a52eb3afeb Merge "Report ActivityId in Content capture ActivityEvent" 2022-10-13 02:33:13 +00:00
TreeHugger Robot
6f245890af Merge "Fix wrong alpha set on background drawable" 2022-10-12 22:11:34 +00:00
Behnam Heydarshahi
07edc2a049 Merge "Separate notification/ring volume sliders in UI" into tm-qpr-dev am: 1387d8d4ac am: 18492d79dc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19939977

Change-Id: I1fa3c65e2d3bfe71f064e72fd5b8b236e66e005e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-12 20:38:18 +00:00
Andrew Solovay
1e7dc6e375 docs: Fixing badly-formatted doc comment am: d80824b57d am: c5c0567f59 am: 8cdf457b51 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20157157

Change-Id: Ib4bddf6126ba1fc0f9d1ea18f66905e03998f2a0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-12 20:10:04 +00:00
Andrew Solovay
8cdf457b51 docs: Fixing badly-formatted doc comment am: d80824b57d am: c5c0567f59 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20157157

Change-Id: Ida0d44fe5a13067294735409cdf3be26738f42a9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-12 20:09:39 +00:00
Andrew Solovay
44b7cc2461 docs: Fixing badly-formatted doc comment am: d80824b57d am: c34e7f9cb4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20157157

Change-Id: I2b92d4dd04e7b97a043e2ddd1087fde3b428db87
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-12 20:09:07 +00:00
Behnam Heydarshahi
18492d79dc Merge "Separate notification/ring volume sliders in UI" into tm-qpr-dev am: 1387d8d4ac 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19939977

Change-Id: I0ed14ab3d6ff7aa245fda866f1db1809aa069950
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-12 20:07:05 +00:00
George Mount
df43b3f297 Fix wrong alpha set on background drawable 
Fixes: 250728240

When the Activity transition was stopped before
the background started fading in, the background
would be set to an alpha = 1. This was the wrong
value, it should have been 255.

Test: new test
Change-Id: Ia1026d17aa516db5d1faf0115f946ee64c15d710
 2022-10-12 12:54:20 -07:00
Andrew Solovay
c5c0567f59 docs: Fixing badly-formatted doc comment am: d80824b57d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20157157

Change-Id: Ia7a6926f97bbce0d8b3371033c6d35f7e751098b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-12 19:40:31 +00:00
Behnam Heydarshahi
1387d8d4ac Merge "Separate notification/ring volume sliders in UI" into tm-qpr-dev 2022-10-12 19:37:25 +00:00
András Kurucz
d6e8b78159 Update Action button order in CallStyle Notifications 
Always show the negative action at the first place.

Bug: 245558391
Test: atest android.app.NotificationTest
Change-Id: I52982efc1d554749d743ecaf5c7ec85be2f85953
 2022-10-12 15:36:16 +00:00
Pat Manning
4591746b13 Merge "Allow to disable showing starting window when start from recents" into tm-qpr-dev am: 67b139b04e am: 10c358b746 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18800470

Change-Id: I7c201337cd582d6c2165a9fc6c42cbadea1b23ed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-12 11:55:47 +00:00
Pat Manning
10c358b746 Merge "Allow to disable showing starting window when start from recents" into tm-qpr-dev am: 67b139b04e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18800470

Change-Id: I2eab7b41505fbab36ea26b7d1bdb8abe446f74a3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-12 11:53:11 +00:00
Pat Manning
67b139b04e Merge "Allow to disable showing starting window when start from recents" into tm-qpr-dev 2022-10-12 11:34:34 +00:00
Joanne
43af15ea0e Report ActivityId in Content capture ActivityEvent 
Currently, the ActivityEvent only reports ComponentName and the event
type. It may be a problem when launching the split mode for tablet.
If the Activity launch mode is standard or singleTop, system allows
to launch the same Activity in split mode. The ContentCaptureService
cannot identify two different Activities instances in the split mode.

To resolve this problem, the system will also report ActivityId in
ActivityEvent to help ContentCaptureService to identify the Activity.

Bug: 245023463
Test: atest CtsContentCaptureServiceTestCases
Change-Id: I8a79633a8ff0e5a99dc154bb4002a418b2e98219
 2022-10-12 19:28:39 +08:00
Gautam Shende
d08eb3f984 Merge "Set dimensional logging info to null for media pass." into tm-qpr-dev am: cdcefab351 am: ad2c02de1e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19571325

Change-Id: Ic59f88aff2434c13f1f2fa4c9804b60391b38e3d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-12 02:21:32 +00:00
Gautam Shende
ad2c02de1e Merge "Set dimensional logging info to null for media pass." into tm-qpr-dev am: cdcefab351 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19571325

Change-Id: I569ccf1cc273d44451afd660d514f56f4f88979c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-12 01:34:46 +00:00
Gautam Shende
cdcefab351 Merge "Set dimensional logging info to null for media pass." into tm-qpr-dev 2022-10-12 01:06:03 +00:00
Jay Thomas Sullivan
42a2f5bcfc Fix startOpNoThrow argument annotation 
The "attributionTag" argument should be @Nullable.

Test: presubmit
Bug: 193924782
Change-Id: I9be85d69b2f45c5c32cd42c3e7ac0a38f3f05fff
 2022-10-11 14:49:14 -07:00
Andrew Solovay
d80824b57d docs: Fixing badly-formatted doc comment 
The Javadoc specification doesn't actually define a {@more}
tag. The Java-reference engine interpreted it as a paragraph
break, but the Kotlin doc engine (more properly) passed the
tag through verbatim.

Replaced it with a <p> to make it a paragraph break in both
languages.

Bug: 247563816
Test: (docs build)
Change-Id: Ib7bb4c2628141b7479c338f1d3fb28da503b847f
 2022-10-10 16:55:46 -07:00
TreeHugger Robot
e9b397ff55 Merge "Stop managed profile owner granting READ_SMS" into qt-dev am: 62044e5099 am: 676cefb0ee am: 539fea38c2 am: e13c6379fb am: e456e2f66e am: fe2c3c269b am: e7253363d2 am: 4e8fadf947 am: 45ee517849 am: f76ce81e85 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15982545

Change-Id: I2a3893cb130c38f8145c6212a6cabaf0ef613283
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-08 16:34:45 +00:00
TreeHugger Robot
f76ce81e85 Merge "Stop managed profile owner granting READ_SMS" into qt-dev am: 62044e5099 am: 676cefb0ee am: 539fea38c2 am: e13c6379fb am: e456e2f66e am: fe2c3c269b am: e7253363d2 am: 4e8fadf947 am: 45ee517849 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15982545

Change-Id: I5a28b7335a19bdea9cfa660cb503e92674ad3a47
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-08 16:09:14 +00:00
TreeHugger Robot
e416cdf686 Merge "Stop managed profile owner granting READ_SMS" into qt-dev am: 62044e5099 am: 676cefb0ee am: 539fea38c2 am: e13c6379fb am: e456e2f66e am: fe2c3c269b am: e7253363d2 am: 4e8fadf947 am: 7fb6a43465 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15982545

Change-Id: Ia5fd11394bd35fad97378cb070d4a5c4b274bf11
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-08 16:08:45 +00:00
TreeHugger Robot
45ee517849 Merge "Stop managed profile owner granting READ_SMS" into qt-dev am: 62044e5099 am: 676cefb0ee am: 539fea38c2 am: e13c6379fb am: e456e2f66e am: fe2c3c269b am: e7253363d2 am: 4e8fadf947 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15982545

Change-Id: I0ee23dd054e2e2a0ce52b36860baa463a6a052d7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-08 15:39:16 +00:00
TreeHugger Robot
4e8fadf947 Merge "Stop managed profile owner granting READ_SMS" into qt-dev am: 62044e5099 am: 676cefb0ee am: 539fea38c2 am: e13c6379fb am: e456e2f66e am: fe2c3c269b am: e7253363d2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15982545

Change-Id: Ie9d40b28095b1977179a0d5c1a853f82bcdd9a91
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-08 15:05:45 +00:00
TreeHugger Robot
e7253363d2 Merge "Stop managed profile owner granting READ_SMS" into qt-dev am: 62044e5099 am: 676cefb0ee am: 539fea38c2 am: e13c6379fb am: e456e2f66e am: fe2c3c269b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15982545

Change-Id: If587b4877ea448484e5e5d1c9f1428d0bb458f62
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-08 14:39:05 +00:00
TreeHugger Robot
fe2c3c269b Merge "Stop managed profile owner granting READ_SMS" into qt-dev am: 62044e5099 am: 676cefb0ee am: 539fea38c2 am: e13c6379fb am: e456e2f66e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15982545

Change-Id: I4cb1023e1b292806706574119291a2480bed2fe7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-08 14:08:37 +00:00
TreeHugger Robot
e456e2f66e Merge "Stop managed profile owner granting READ_SMS" into qt-dev am: 62044e5099 am: 676cefb0ee am: 539fea38c2 am: e13c6379fb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15982545

Change-Id: I83dfe3ce05718113bd6acb1daed09b51f5b60a0c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-08 13:38:01 +00:00
TreeHugger Robot
e13c6379fb Merge "Stop managed profile owner granting READ_SMS" into qt-dev am: 62044e5099 am: 676cefb0ee am: 539fea38c2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15982545

Change-Id: Ia131a4e9679f0aa1e0a3f508cf98383f4f27be21
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-08 13:06:31 +00:00
TreeHugger Robot
539fea38c2 Merge "Stop managed profile owner granting READ_SMS" into qt-dev am: 62044e5099 am: 676cefb0ee 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15982545

Change-Id: I7a377d2787cb077e3d717558da0b21e297699112
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-08 12:36:21 +00:00
TreeHugger Robot
676cefb0ee Merge "Stop managed profile owner granting READ_SMS" into qt-dev am: 62044e5099 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15982545

Change-Id: I3bf51cd6e7046c7e128f1008ed830c5e02603f88
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-08 12:05:20 +00:00
TreeHugger Robot
62044e5099 Merge "Stop managed profile owner granting READ_SMS" into qt-dev 2022-10-08 11:41:10 +00:00
Neil Fuller
483cac85da Merge "Fix linter / errorprone issues" 2022-10-06 18:40:50 +00:00
Neil Fuller
321916dd83 Fix linter / errorprone issues 
Fix some issues with newly added parcelable objects: lint and a
parcelling issue.

Also update the associated tests to use existing infrastructure.

Bug: 236612872
Test: build / treehugger
Test: atest core/tests/coretests/src/android/app/time/
Change-Id: Ib7d3589ac8b4c022dc9fb20e0bdc6fa67a46c9b9
 2022-10-06 15:05:16 +01:00
TreeHugger Robot
74442712d0 Merge "Refactoring and tweaking TimeSparseArray" 2022-10-06 06:30:32 +00:00
TreeHugger Robot
d6e7cef873 Merge "Inform Assistant visible activity when the stage of activity lifecycle is invoked." 2022-10-06 02:08:43 +00:00
Suprabh Shukla
c6dcd3e42e Refactoring and tweaking TimeSparseArray 
Tweaking the returned result from the boundary condition in
closestIndexOnOrAfter to be conceptually similar to
closestIndexOnOrBefore. This should also make it simpler to use by
callers.

Also exposing the class more broadly by moving it to android.util

Test: atest FrameworksCoreTests:TimeSparseArrayTest

Bug: 195684213
Change-Id: I44a06db8792d590be0eea4de39bc81387f2baac8
 2022-10-05 14:37:42 -07:00
Neil Fuller
f5f7180747 Merge "Remove usages of TimestampedValue<Long>" 2022-10-05 17:33:55 +00:00
John Wu
20e6f6e532 Merge "Do not resolve ActivityInfo in navigateUpTo" into tm-qpr-dev am: 576b93c7fe 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20110224

Change-Id: I0fd0adbd798da445f3f1bd35c0250136d22bf306
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-05 16:59:36 +00:00
John Wu
576b93c7fe Merge "Do not resolve ActivityInfo in navigateUpTo" into tm-qpr-dev 2022-10-05 16:36:10 +00:00
Behnam Heydarshahi
60cd96f8da Separate notification/ring volume sliders in UI 
Separate the logic between notification slider and ring slider in
setting through new logic in SeekBarVolumizer when ring is not aliased
with notification in config.xml.

Start the notif/ring separation code but hide it in the new SysUI volume dialog.

Bug: b/38477228

Test: manual
      (1) With ring/notif alias set to false, in the Sound Settings, drag ring volume to zero. Verify notification volume snaps to zero as well. Then drag the notification volume out of zero. Verify that notification volume is stable at the new value and does not wrongly snap back to zero.
      (2) With the alias set to false, drag media volume to zero, midpoint, and max. Verify the slider control is stable, and that the audio level corresponds relative to the level on UI.
      (3) Repeat test 2 with the alias set to true.

Change-Id: Ifff4c06a952ba13dc6d6830fea5fe47651fa5b2e
 2022-10-05 15:52:17 +00:00
Neil Fuller
5a86476d87 Merge changes from topic "initialization_apis" 
* changes:
  Implement proposed device initialization APIs
  Improve debug / bug report logging for time zones
 2022-10-05 15:45:42 +00:00