Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
766,998 Commits 3 Branches 0 Tags
ed06ccd40259911a8d26a92f154056007102ccbd
Commit Graph

766998 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Treehugger Robot
ed06ccd402 Merge "Add null pointer check to avoid system crash." am: a04929ef9e 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2189316

Change-Id: I8852deb12631005a3723a075ed6e36065d08c0c6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-28 23:12:10 +00:00
Automerger Merge Worker
2f941f7af3 Merge "Merge "Add ABS_MT_SLOT config to virtual touch screen." into android13-tests-dev am: 36bccb6ba5" am: d850a82bf4 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2234609

Change-Id: Ic70915199b79bbad8a51be2b6787cfc9a1ddbe17
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-28 23:11:46 +00:00
Treehugger Robot
a04929ef9e Merge "Add null pointer check to avoid system crash." 2022-09-28 22:58:42 +00:00
Automerger Merge Worker
d850a82bf4 Merge "Merge "Add ABS_MT_SLOT config to virtual touch screen." into android13-tests-dev am: 36bccb6ba5" 2022-09-28 22:44:24 +00:00
Shubhangi Pawar
910989fac4 Merge "Add ABS_MT_SLOT config to virtual touch screen." into android13-tests-dev am: 36bccb6ba5 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2234609

Change-Id: I20d250d643b26bcbda6b4bb3ed7ac34dd1dcc9c7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-28 22:44:10 +00:00
Shubhangi Pawar
36bccb6ba5 Merge "Add ABS_MT_SLOT config to virtual touch screen." into android13-tests-dev 2022-09-28 22:21:05 +00:00
Sorin Basca
7ef2a66679 Merge "Unpin staledataclass-annotation-processor from Java 8" am: 818cc23210 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2234390

Change-Id: I5f0bd5c79bbdca6a9a3256ac9c3fb376ec5ba6ca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-28 19:14:33 +00:00
Sorin Basca
818cc23210 Merge "Unpin staledataclass-annotation-processor from Java 8" 2022-09-28 19:00:34 +00:00
Treehugger Robot
417bf37aa6 Merge "Add IMF ownership in HandwritingIme" am: fada1cb8f0 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2235236

Change-Id: I6acc1f684791ae4ec7c0a1b74ec92418fed40bd0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-28 18:59:18 +00:00
Treehugger Robot
fada1cb8f0 Merge "Add IMF ownership in HandwritingIme" 2022-09-28 18:04:40 +00:00
Daniel Norman
7ba78da385 Merge "Stops updating A11yUserState on ACTION_USER_PRESENT." am: f38f9ca575 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2232548

Change-Id: Idbe86c4f87c6c3efbec6e00651c0201fad09661c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-28 16:35:20 +00:00
Daniel Norman
f38f9ca575 Merge "Stops updating A11yUserState on ACTION_USER_PRESENT." 2022-09-28 16:10:59 +00:00
Trevor Black
12328c36f4 Merge "Add performance test suite for opengl Matrix operations" am: 25deb4c81b 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2231216

Change-Id: I33ef7f5e78c69e79130d53ce8226a839f75d26d6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-28 14:28:02 +00:00
Treehugger Robot
0f75c2b347 Merge "Toast: Fix ActivityRecord does not attached to process" am: 185c1bced8 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2233847

Change-Id: I395dbb56a55906546d3ba95309129d5342e7f9d1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-28 14:26:25 +00:00
Trevor Black
25deb4c81b Merge "Add performance test suite for opengl Matrix operations" 2022-09-28 13:58:34 +00:00
Treehugger Robot
185c1bced8 Merge "Toast: Fix ActivityRecord does not attached to process" 2022-09-28 13:33:11 +00:00
Treehugger Robot
72cbd9351c Merge "Revert "Get HDMI CEC physical address with service thread, so TIF can get it for Player."" am: de8f4b28ee 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2235816

Change-Id: Ie23ff4d82f5df8a0d8bbf33f38adcdbfc76732e6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-28 09:55:22 +00:00
Treehugger Robot
de8f4b28ee Merge "Revert "Get HDMI CEC physical address with service thread, so TIF can get it for Player."" 2022-09-28 09:24:00 +00:00
Krzysztof Kosiński
fac256f532 Merge "Explicitly discard released proto strings." am: 5df912d6f5 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2231027

Change-Id: Ibf7c9419144ee2b1f8c162f8871a815889ef388b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-28 06:16:22 +00:00
Krzysztof Kosiński
5df912d6f5 Merge "Explicitly discard released proto strings." 2022-09-28 05:15:51 +00:00
Gregory Montoir
8fd474d1ab Revert "Get HDMI CEC physical address with service thread, so TIF can get it for Player." 
This reverts commit 75fbb23955.

Reason for revert: ag/20027273/comment/ae6b1273_1c5220c5/

Change-Id: I292e093f0e8f7843c8da09c28a48ab7250a5721e
 2022-09-28 04:34:18 +00:00
Treehugger Robot
a2ba909c39 Merge changes Ifd00d8d4,Id8db2858 am: eb3651fe72 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2212407

Change-Id: Ibadf7dc53901bbea7bec4cfcb599d1b8fcd5f662
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-28 00:15:51 +00:00
Treehugger Robot
eb3651fe72 Merge changes Ifd00d8d4,Id8db2858 
* changes:
  Declare the headers of the ndk_library
  Declare the headers of the ndk_library
 2022-09-27 23:22:07 +00:00
Daniel Norman
5a041e439e Stops updating A11yUserState on ACTION_USER_PRESENT. 
This was useful when the A11yUserState was temporarily modified
while the keyguard was on. However, ever since the a11y gesture
from commit 106fe73205
the A11yUserState is no longer temporarily modified this way.

Bug: 247045101
Test: a11y presubmit tests
Change-Id: I6fde21fe84cea3cae5f0dfa86fcd811a22542cc5
 2022-09-27 23:19:04 +00:00
Trevor David Black
e7fcbaa91f Add performance test suite for opengl Matrix operations 
Bug: 245018194
Test: android.opengl.Matrix.*
Change-Id: Ib7b510e8aee06d9e3d614d54583ac51d03a89ffb
 2022-09-27 21:34:08 +00:00
Juan Yescas
a4ed6716da Merge changes from topic "ddr_size_api" am: c12a383385 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2193505

Change-Id: I2af1c91c85709a6c084b5488960fc76f264dd39c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-27 20:59:50 +00:00
Juan Yescas
ab61310d91 Add method to parse the size in FileUtils am: 71e11ae9ba 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2192359

Change-Id: I3c8bcaac252e2aa0fe4a449e89ddeefe18afb8d4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-27 20:59:40 +00:00
Juan Yescas
c12a383385 Merge changes from topic "ddr_size_api" 
* changes:
  Add new field in MemoryInfo to get advertised memory size.
  Add method to parse the size in FileUtils
 2022-09-27 20:55:42 +00:00
Taran Singh
8ddee9b3ef Add IMF ownership in HandwritingIme 
Add ownership file to test Handwriting IME
Bug: 236765468
Test: none

Change-Id: I3cc5f7578ea6b4164160c934ca22fcb58cef2190
 2022-09-27 13:04:44 -07:00
Zixuan Qu
1f6323ddfb Add ABS_MT_SLOT config to virtual touch screen. 
Cherry-picked-from: ag/19908041

Bug: 244744917
Bug: 233960835
Bug: 233327669

Test: atest VirtualDeviceManagerServiceTest

Change-Id: I58f0302e4df3415cff74646d7424c699d98cbca7
 2022-09-27 19:20:31 +00:00
Cole Faust
6eda1f24b6 Merge "Add null checks" am: 2e77ad99c6 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2232549

Change-Id: Id5ebc78960b9e4ca396fd56c5748ed188b5031fe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-27 17:19:15 +00:00
Sorin Basca
73cb9bdb19 Unpin staledataclass-annotation-processor from Java 8 
Test: m
Fixes: 139342589
Change-Id: Ie4791425a4fcdf551ffa70b2c02ab3ed13e57eaa
 2022-09-27 18:02:06 +01:00
Spandan Das
76d971d0d6 Declare the headers of the ndk_library 
This creates a dependency edge between the ndk_library and its headers,
which should be a no-op in regular Soong builds. This dependency edge
will be used in the Multi-tree project to export the relevant .h files into a well
known location

The headers are in a different git project (frameworks/native)

Test: m nothing
Bug: 239044713
Change-Id: Ifd00d8d4d3771b2dbd924cea4f2ade0bafc15ed6
 2022-09-27 16:58:15 +00:00
Spandan Das
fb6602dcf6 Declare the headers of the ndk_library 
This creates a dependency edge between the ndk_library and its headers,
which should be a no-op in regular Soong builds. This dependency edge
will be used in the Multi-tree project to export the relevant .h files into a well
known location

Formatting changes are from bpfmt

Test: m nothing
Bug: 239044713
Change-Id: Id8db2858875a4aee904456fe3dec77c71fa47dc9
 2022-09-27 16:58:12 +00:00
Cole Faust
2e77ad99c6 Merge "Add null checks" 2022-09-27 16:35:46 +00:00
Juan Yescas
7afbbec42f Add new field in MemoryInfo to get advertised memory size. 
This API will get the advertised memory size from the bootloader parameter
passed to the kernel. The advertised memory size might be different from
the MemTotal value in /proc/meminfo. This could be due the original design
manufacturer (ODM) reserved part of the memory for the Trusted Execution
Environment.

Test: Run test caes
Bug: 231718727
Change-Id: I06494cb9013048d73a83f2180a9241c2259d46eb
 2022-09-27 15:11:52 +00:00
Juan Yescas
71e11ae9ba Add method to parse the size in FileUtils 
The method parseSize() will parse the strings that match
the regular expression:

  "^((\\s*[-+]?[0-9]+)\\s*(B|K|KB|M|MB|G|GB|Ki|KiB|Mi|MiB|Gi|GiB)\\s*)$"

For example: 12GB, +100MB, 23MiB.

It will return the size in bytes.

Test: atest
Bug: 231718727
Change-Id: Id4b9084d2ff8a0a8bd23ddb8a7e10dcf17391c49
 2022-09-27 15:11:05 +00:00
hupeng3
4842a82cee Toast: Fix ActivityRecord does not attached to process 
ActivityRecord's IApplicationThread has been set to null due
to the process being killed. At this time, the ActivityRecord
is no longer used.

Bug: 249221879

Test: build and boot

Signed-off-by: hupeng3 <hp121520@gmail.com>
Change-Id: I47b8ee8cb779dc64c4353d39d38b6c5d65fb8373
 2022-09-27 17:22:39 +08:00
Jernej Virag
cea2abb795 Merge "Fix crash when trying to dismiss dialog" am: 3023a33455 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2229977

Change-Id: Iafa10b0e35fe756a82280e330b2af783aa860d59
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-27 08:29:06 +00:00
Jernej Virag
3023a33455 Merge "Fix crash when trying to dismiss dialog" 2022-09-27 08:18:34 +00:00
Treehugger Robot
d6775e2d9d Merge "CtsWindowManagerDeviceTestCases android.server.wm.KeyguardTests#testResumeDismissKeyguardActivityFromBackground --fail" am: d079002768 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2219764

Change-Id: Ibd15dc5199faff57c58a1ea823d308af67032a7a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-27 08:16:46 +00:00
Treehugger Robot
d079002768 Merge "CtsWindowManagerDeviceTestCases android.server.wm.KeyguardTests#testResumeDismissKeyguardActivityFromBackground --fail" 2022-09-27 07:51:15 +00:00
bo.yan
cdfce8c8f1 CtsWindowManagerDeviceTestCases android.server.wm.KeyguardTests#testResumeDismissKeyguardActivityFromBackground --fail 
Change-Id: Ia0a52477fc62b403c678301c8e49561d3b23bedf
Merged-In: Ia0a52477fc62b403c678301c8e49561d3b23bedf
 2022-09-27 00:57:34 +00:00
Cole Faust
7b364e515c Add null checks 
Lint is being updated, and a type that used to be non-null
is now nullable, and needs to be null checked.

Bug: 247885568
Test: Presubmits
Change-Id: I7fc09a9d2d312485071364279c448550e3a1e124
Merged-In: Ie6eaf061d74bd773742aa47f731e95e4b137f438
 2022-09-27 00:16:50 +00:00
Lee Shombert
3eb2dc4a12 Merge "Assign OWNERS for android/server/resources" am: 6ffa5fcc40 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2229295

Change-Id: I64a4b3e362e51053452f0478fcf851408f5910d3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-26 21:04:57 +00:00
Lee Shombert
6ffa5fcc40 Merge "Assign OWNERS for android/server/resources" 2022-09-26 20:41:30 +00:00
Shen Lin
a90b57acd8 Fix crash when trying to dismiss dialog 
Calling Dialog.dismiss() requires a safe condition, including that
dialog is shown，and activity is neither finishing nor destroying, so we
should add a precondition check here to avoid crash.

Bug: 248562161
Test: manual and atest
Change-Id: I87de2cd05680815d4bb4e80ac1e0d6e2e4a685f7
 2022-09-26 23:13:45 +08:00
Treehugger Robot
82714720a3 Merge "Add FLAG_IMMUTABLE to PendingIntents" am: 766bd4cedb 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2230254

Change-Id: Ic65cd21de15d67b0355e970357a1e6ee5e396c97
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-26 13:12:35 +00:00
Treehugger Robot
766bd4cedb Merge "Add FLAG_IMMUTABLE to PendingIntents" 2022-09-26 12:59:56 +00:00
Bill Yi
f87e9dfd23 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 82393b1d55 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I6e97faf6decdc2c6f020726c572d8c863d3beea7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-26 03:23:51 +00:00