Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
886,810 Commits 3 Branches 0 Tags
03544c3c3be2fa823d4dd38d8178c472ca4e2dff
Commit Graph

886810 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Treehugger Robot
03544c3c3b Merge "Clean up UI todos." into udc-dev am: 8c9bc646eb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23121340

Change-Id: I383f1afcb23fbabf2cada95d755fa39196dc15eb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-10 01:31:58 +00:00
Treehugger Robot
8c9bc646eb Merge "Clean up UI todos." into udc-dev 2023-05-10 00:59:55 +00:00
Treehugger Robot
3934890d5a Merge "Fix ShowImeOnAppStartWhenLaunchingAppFromQuickSwitchTest flaky" into udc-dev am: 9cb245bda4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23056500

Change-Id: Id5d71baad4d2ca8e5f0414f5734fa8d0e1f50317
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-10 00:39:52 +00:00
Treehugger Robot
e5e3612fda Merge "Implement InputConnectionWrapper#replaceText()" into udc-dev am: 3c532f3b8f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23058344

Change-Id: I3f4b85a3e2bbe052089bcf64fdea12115342e3f4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-10 00:38:12 +00:00
Juan Yescas
a020e5bab2 [automerger skipped] Merge "Return TotalMemory size when ddr size is not present" into udc-dev am: 6a9af3fd32 -s ours 
am skip reason: Merged-In I2323d79d869a4c58eb29d0cae351144f357b867d with SHA-1 f572402f11 is already in history

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

Change-Id: I994991fb67c1d0e782f63f15b7e775d10b4b955d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-10 00:34:50 +00:00
Juan Yescas
531360c410 [automerger skipped] Return TotalMemory size when ddr size is not present am: 34f1eab423 -s ours 
am skip reason: Merged-In I2323d79d869a4c58eb29d0cae351144f357b867d with SHA-1 f572402f11 is already in history

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

Change-Id: I108b07410eeded86917d92bbc86b2eeda499e1f4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-10 00:34:42 +00:00
Mady Mellor
1d4288c0f4 Merge "Fix surface crop being wrong after rotation" into udc-dev am: 974c3d9558 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23091738

Change-Id: I312e86979d255d4ee27eabffc6b840d4ff8d60a8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-10 00:32:41 +00:00
Automerger Merge Worker
97b2efcc1e Merge "Merge "Return early in removeTask if there is no task token" into udc-dev am: 0ea18527f7" into udc-dev-plus-aosp 2023-05-10 00:31:01 +00:00
Mady Mellor
3beeaac286 Merge "Return early in removeTask if there is no task token" into udc-dev am: 0ea18527f7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23087090

Change-Id: If02b23b3e237edfda225b8df2eff83a21309ca21
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-10 00:30:29 +00:00
Treehugger Robot
f05f404bfe Merge "Hide data limit notfication if data not active nor default" am: b6fbb9784f am: 38b31cdf29 am: 233ee2a71b 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2541633

Change-Id: Id4b9cb21837e962de535e1797b079d6ba86a5959
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-10 00:30:07 +00:00
Juan Yescas
1ece5c0e1a Merge "Return TotalMemory size when ddr size is not present" am: 24e934c0c3 am: c1029121ac am: ff3b946914 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2583778

Change-Id: Iba685e2107f196ac0cbe79a1e29ab7228f5d194c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-10 00:29:14 +00:00
Treehugger Robot
9cb245bda4 Merge "Fix ShowImeOnAppStartWhenLaunchingAppFromQuickSwitchTest flaky" into udc-dev 2023-05-10 00:21:21 +00:00
Treehugger Robot
3c532f3b8f Merge "Implement InputConnectionWrapper#replaceText()" into udc-dev 2023-05-10 00:10:45 +00:00
Juan Yescas
6a9af3fd32 Merge "Return TotalMemory size when ddr size is not present" into udc-dev 2023-05-10 00:05:47 +00:00
Mady Mellor
974c3d9558 Merge "Fix surface crop being wrong after rotation" into udc-dev 2023-05-09 23:56:26 +00:00
Mady Mellor
0ea18527f7 Merge "Return early in removeTask if there is no task token" into udc-dev 2023-05-09 23:55:59 +00:00
Isaac Katzenelson
5cff737ed5 Merge "Handle null fields when using parcels." into udc-dev am: 54d0cacacd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23091188

Change-Id: Id6132b32c9247e7d5d1513b57ccf502e0d102b75
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-09 23:48:42 +00:00
Treehugger Robot
233ee2a71b Merge "Hide data limit notfication if data not active nor default" am: b6fbb9784f am: 38b31cdf29 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2541633

Change-Id: Ibe2eb6f92f872339a31cbca1aaec885bd69a5c7d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-09 23:46:58 +00:00
Juan Yescas
ff3b946914 Merge "Return TotalMemory size when ddr size is not present" am: 24e934c0c3 am: c1029121ac 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2583778

Change-Id: I94b51b86f028d7f19171aeca827cfe59f5d404a4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-09 23:46:38 +00:00
Makoto Onuki
94a3a152ca Merge "Extract WTF to a separate method for easier search" into udc-dev am: 813b664c00 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23089116

Change-Id: I346633ac0b1c137c363722ef7301d7dc32b08a67
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-09 23:46:18 +00:00
Isaac Katzenelson
54d0cacacd Merge "Handle null fields when using parcels." into udc-dev 2023-05-09 23:45:07 +00:00
Candice Lo
a5202d2c9d Merge "Separating the UI logic for SettingsPanel and ModeSwitchButton" into udc-dev am: 1c02715ebc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23078796

Change-Id: I7aa14a76bd21287813025216f2e0a6d8e21192cb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-09 23:44:35 +00:00
Makoto Onuki
813b664c00 Merge "Extract WTF to a separate method for easier search" into udc-dev 2023-05-09 23:22:39 +00:00
Candice Lo
1c02715ebc Merge "Separating the UI logic for SettingsPanel and ModeSwitchButton" into udc-dev 2023-05-09 23:18:48 +00:00
Suprabh Shukla
3007d3c4f9 Merge "Avoid redundant overwrite of value in TimeSparseArray" into udc-dev am: 7e39238a1f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23090943

Change-Id: I5d1ccd5e629546f3f4101522f9f3b752be9b892b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-09 23:06:56 +00:00
Treehugger Robot
38b31cdf29 Merge "Hide data limit notfication if data not active nor default" am: b6fbb9784f 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2541633

Change-Id: I03ecbf6e882c4499f5549f2a48fdb01b0b8ba862
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-09 23:06:17 +00:00
Piyush Mehrotra
40a4dbd95f Merge changes from topic "br-cts-hsum" into udc-dev am: 82a2b5e93c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22327092

Change-Id: I121d410cc3c91331a5dd526d3f0523c77a4c99ba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-09 23:06:08 +00:00
Piyush Mehrotra
9305f89823 Improve dumpsys backup am: da26f028ae 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22327091

Change-Id: Ifd401842f48f2dee79792c00e91ae23a2e356b53
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-09 23:05:58 +00:00
Juan Yescas
c1029121ac Merge "Return TotalMemory size when ddr size is not present" am: 24e934c0c3 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2583778

Change-Id: Id64b599c47d51be0fe93477abab40723633aaa86
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-09 23:03:36 +00:00
Suprabh Shukla
7e39238a1f Merge "Avoid redundant overwrite of value in TimeSparseArray" into udc-dev 2023-05-09 22:53:17 +00:00
Treehugger Robot
b6fbb9784f Merge "Hide data limit notfication if data not active nor default" 2023-05-09 22:49:31 +00:00
Piyush Mehrotra
82a2b5e93c Merge changes from topic "br-cts-hsum" into udc-dev 
* changes:
  Modifying Backup code to support HSUM mode.
  Improve `dumpsys backup`
 2023-05-09 22:49:06 +00:00
Chandru S
012860079a Merge "Add onTrustManagedChanged state to TrustRepository" into udc-dev am: 81beed54e3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22906407

Change-Id: I5653088eabdb46140ae4eb6b00227a72624df36c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-09 22:45:55 +00:00
Kunal Malhotra
05ecc204cc Merge "Adding proc state to wakelock logging" into udc-dev am: a61baacdeb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23062819

Change-Id: I8296a7253dd146b9ac36ce7ffb41a80f4aed2fc4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-09 22:44:21 +00:00
Haoyu Zhang
e42c8b5eeb Merge "Introduce handwriting hover icon and update its hide/show logic" into udc-dev am: f7e5dac822 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22913454

Change-Id: I4cb3af341e8910ebf2a6a18c015ce06f2c41d834
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-09 22:43:22 +00:00
Treehugger Robot
9f996cd295 Merge "Camera: Always release the extension session after configuration" into udc-dev am: bce1bf4fdc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23064805

Change-Id: I77f91e7b152ced078e9f1de1babe62baf2b03a01
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-09 22:42:28 +00:00
Chandru S
81beed54e3 Merge "Add onTrustManagedChanged state to TrustRepository" into udc-dev 2023-05-09 22:42:09 +00:00
Sudheer Shanka
31fb039748 Merge "Add a callback to listen to uid foreground-ness change." into udc-dev am: b0302b10b2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22499498

Change-Id: I42fb64d60a6d1b9f7f975dca750f99288ebdf913
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-09 22:41:25 +00:00
Priyanka Advani
64cd8f4812 Merge changes from topic "revert-23033485-WUUYRIDOOG" into udc-dev am: c63158973a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23118164

Change-Id: Id9678fe8c460708c04f0077ac3eefe9bfccf5caf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-09 22:39:33 +00:00
Kunal Malhotra
a61baacdeb Merge "Adding proc state to wakelock logging" into udc-dev 2023-05-09 22:32:35 +00:00
Haoyu Zhang
f7e5dac822 Merge "Introduce handwriting hover icon and update its hide/show logic" into udc-dev 2023-05-09 22:32:28 +00:00
Treehugger Robot
bce1bf4fdc Merge "Camera: Always release the extension session after configuration" into udc-dev 2023-05-09 22:21:11 +00:00
Sudheer Shanka
b0302b10b2 Merge "Add a callback to listen to uid foreground-ness change." into udc-dev 2023-05-09 22:20:15 +00:00
Juan Yescas
34f1eab423 Return TotalMemory size when ddr size is not present 
When the ddr size is not present or it is invalid, getAdvertisedMem()
must return getTotalMemory() size.

Bug: 278977257
Test: atest frameworks/base/core/tests/coretests/src/android/os/ProcessTest.java
Merged-In: I2323d79d869a4c58eb29d0cae351144f357b867d
Change-Id: I2323d79d869a4c58eb29d0cae351144f357b867d
 2023-05-09 22:19:05 +00:00
Priyanka Advani
c63158973a Merge changes from topic "revert-23033485-WUUYRIDOOG" into udc-dev 
* changes:
  Revert "Carrier text: add LogBuffer debug logs"
  Revert "Add @SysUISingleton to repository switcher classes"
 2023-05-09 22:17:21 +00:00
Juan Yescas
24e934c0c3 Merge "Return TotalMemory size when ddr size is not present" 2023-05-09 22:16:51 +00:00
Ale Nijamkin
cff5d912f4 Merge changes from topic "flexiglass-container-config-b279501596" into udc-dev am: 92e7e12081 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22828278

Change-Id: I8751fec23d5f1eeec742b49cdf1d5c92aa695559
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-09 22:02:41 +00:00
Kathy Chen
bc6df7e717 Merge "Revert "Revert "[AC] Fix NPE. If the client sends multiple unregister requests at the same time, the client request could be null before the next request is processed.""" into udc-dev am: f415752b8d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23100716

Change-Id: I09c1f40effa2ac09eb220b91e4bcdb4430ba292a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-09 21:59:01 +00:00
Atneya Nair
2660366166 Merge "Remove ST INTERCEPTED state" into udc-dev am: 528cd329f0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23065725

Change-Id: I67e040d5de079e80d4219ab570d4e44a25f4b6c3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-09 21:56:50 +00:00
Ale Nijamkin
92e7e12081 Merge changes from topic "flexiglass-container-config-b279501596" into udc-dev 
* changes:
  [flexiglass] Container config - UI layer.
  [flexiglass] Container config - domain layer.
  [flexiglass] Container config - data layer.
 2023-05-09 21:55:51 +00:00