Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
680,120 Commits 3 Branches 0 Tags
360a31df34ec62afcd47cd5d67d4cb97e8d8d852
Commit Graph

16946 Commits

Author SHA1 Message Date
Treehugger Robot
81dd7537eb Merge "Fix an issue when empty the usap pool." am: faf1b1cf0b am: 9078248b75 am: 80f41edf05 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1893002

Change-Id: Idbaa45d4871c7e6c1e15d7af4fb432a2b24a49cf
 2021-11-29 08:28:34 +00:00
Treehugger Robot
80f41edf05 Merge "Fix an issue when empty the usap pool." am: faf1b1cf0b am: 9078248b75 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1893002

Change-Id: Id444bd4f7b15a985fa026bde136a15c0efab7d38
 2021-11-29 08:14:54 +00:00
Treehugger Robot
9078248b75 Merge "Fix an issue when empty the usap pool." am: faf1b1cf0b 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1893002

Change-Id: I6d5e04471f756ee5544bb1f77cf1927f44d7715a
 2021-11-29 08:00:57 +00:00
Treehugger Robot
faf1b1cf0b Merge "Fix an issue when empty the usap pool." 2021-11-29 07:46:36 +00:00
zhangjianqiu
1bc2b9c612 Fix an issue when empty the usap pool. 
When empty the usap pool, the usap processes may be blocked by
usapPoolSocket.accept(), which cause the usap process fail to kill
immediately. So we can move the position of blockSigTerm after
usapPoolsSocket.accept() and delele the old blockSigTerm in the while
loop.

Test: manual test.
1.setprop persist.device_config.runtime_native.usap_pool_enabled true.
After 1 min, trigger fill usap pools.
2.setprop persist.device_config.runtime_native.usap_pool_enabled false.
After 1 min, trigger empty usap pools.
3.repeat step 1.

Signed-off-by: zhangjianqiu <zhangjianqiu@oppo.com>
Change-Id: I657940b30f71cdc717c673be6d70738e61e2bb68
 2021-11-24 09:48:01 +08:00
Treehugger Robot
aad398ed08 Merge "Framework and system_server classes can access public vendor libraries" am: 8cb6d28329 am: 1f479b99ce am: 6d0d1ff1e6 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1885792

Change-Id: I46c8afc6889b9e01e0d48e011092b49f5cee5a12
 2021-11-19 01:05:19 +00:00
Treehugger Robot
6d0d1ff1e6 Merge "Framework and system_server classes can access public vendor libraries" am: 8cb6d28329 am: 1f479b99ce 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1885792

Change-Id: I924242f514458f53cfb71ef83b5084646c8b1b73
 2021-11-19 00:47:09 +00:00
Treehugger Robot
1f479b99ce Merge "Framework and system_server classes can access public vendor libraries" am: 8cb6d28329 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1885792

Change-Id: Ia8fe285e3668fac4c2d6ca8ffff2976df88f90c3
 2021-11-19 00:29:06 +00:00
Treehugger Robot
8cb6d28329 Merge "Framework and system_server classes can access public vendor libraries" 2021-11-19 00:08:57 +00:00
Issei Suzuki
b6bb0424f0 Merge "Stop output WM_DEBUG_WALLPAPER logs to logcat" into sc-v2-dev am: 8dfb06f117 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16283220

Change-Id: I2e622e390e341f1ef11088eff9265bb53ed39ed1
 2021-11-18 19:51:05 +00:00
Xin Li
10d9972786 Merge sc-qpr1-dev-plus-aosp-without-vendor@7810918 
Bug: 205056467
Merged-In: I13199bc39e9445929195f3d15579cbffe94e92b0
Change-Id: I35fa3c6c2abf679c51033f1395a08d511ed8739f
 2021-11-18 17:00:37 +00:00
Jiyong Park
24c57c33ea Framework and system_server classes can access public vendor libraries 
This CL fixes a regression caused by [1] which introduced
<uses-native-library> tag [2]. With the change, public vendor libraries
[3] became accessible only when they are listed in the caller's
AndroidManifest.xml using the new tag. However, this caused a problem to
the places where AndroidManifest.xml doesn't exist: framework and
system_server classes. For those cases, [1] incorrectly used a null list
as the requested native libraries, and as a result, no public vendor
libraries were accessible.

This CL fixes the issue by not doing the filtering for the class loaders
created for non-app contexts like zygote or system_server. Specifically,
it uses the magic keyword "ALL" which let libnativeloader.so
accept all public vendor libraries.

[1] 6a5b8b1f6d
[2] https://developer.android.com/guide/topics/manifest/uses-native-library-element
[3] https://source.android.com/devices/tech/config/namespaces_libraries#adding-additional-native-libraries

Bug: 205164833
Test: libcuttlefish_fs.so is loaded when built with the other CLs in the
same topic

Change-Id: Id92c59642773851d70d05a05f43eb5873e9de86b
 2021-11-18 23:09:27 +09:00
Maciej Żenczykowski
9dab125ae7 Merge "switch to using OWNERS from master branch of Connectivity module" am: b86ab4ae44 am: 0700ad89f8 am: 95b11d997d 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1894917

Change-Id: Ib56d12889921c9238e68942d6fff004e5b7de18e
 2021-11-17 19:36:42 +00:00
Maciej Żenczykowski
95b11d997d Merge "switch to using OWNERS from master branch of Connectivity module" am: b86ab4ae44 am: 0700ad89f8 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1894917

Change-Id: I649bf90ff9d7c20eaeb32963c3f5c5bfc9be3ea1
 2021-11-17 19:13:50 +00:00
Issei Suzuki
d2f718cbf3 Stop output WM_DEBUG_WALLPAPER logs to logcat 
Bug: 202392340
Test: manual
Change-Id: I0e1c06182f57a195896142f6bcdaafeb7001fb74
 2021-11-17 14:22:05 +01:00
Maciej Żenczykowski
7069443319 switch to using OWNERS from master branch of Connectivity module 
Test: N/A
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: Ifa4a38522ac3aa830e2a7f8b23ad190a334458bc
 2021-11-17 00:37:40 -08:00
Treehugger Robot
2d3bb1c042 Merge "Fix typo in BaseIWindow.java owners file" am: b2f814064e am: 6d5a079682 am: 063df04968 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1893295

Change-Id: I1531bdbe8f5201b6265709005924aaef09e16b39
 2021-11-16 18:34:24 +00:00
Treehugger Robot
063df04968 Merge "Fix typo in BaseIWindow.java owners file" am: b2f814064e am: 6d5a079682 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1893295

Change-Id: Ie4a7b7432d7da4b7b5f2efc1e1eb8ee01d3ba582
 2021-11-16 18:10:39 +00:00
Treehugger Robot
b2f814064e Merge "Fix typo in BaseIWindow.java owners file" 2021-11-16 17:57:38 +00:00
Treehugger Robot
fa6d0cfdb1 Merge "remove PROP_QTAGUID_ENABLED" am: 999147b4ab am: 8d888d92ed am: b3135ed72d 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1888335

Change-Id: Ic0b15f0fa54ceb4f62114fd29248e7427fa5f86b
 2021-11-16 04:47:59 +00:00
Treehugger Robot
b3135ed72d Merge "remove PROP_QTAGUID_ENABLED" am: 999147b4ab am: 8d888d92ed 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1888335

Change-Id: Ib9e2b3e5c248b3acbfea21e6eeda1ec879acd31c
 2021-11-16 04:30:08 +00:00
Vishnu Nair
8cd9256c50 Fix typo in BaseIWindow.java owners file 
Change-Id: I7ea7fb4a9fc16aa007e4a6970d550f906da202f7
 2021-11-15 23:38:05 +00:00
Wu Ahan
12b1a2ef2e Merge "Add null check before notifying CUJ events" into sc-v2-dev am: 60316d327f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16221675

Change-Id: I406eee540d6fa8e36f5975ef39ee8228e47e2322
 2021-11-13 04:50:51 +00:00
Wu Ahan
eec2d1237d Add null check before notifying CUJ events 
There is a potential NPE since we didn't have null check before sending
broadcast, so add null cehck.

Bug: 205211901
Test: Manually
Change-Id: Icc60d2c87941373943ec627f669598dca684c09d
 2021-11-12 09:06:44 +00:00
Maciej Żenczykowski
cb6164c141 remove PROP_QTAGUID_ENABLED 
Remaining hits:
  $ repo grep 'net.qtaguid_enabled|PROP_QTAGUID_ENABLED' | egrep -v '^external/cpuinfo/test/mock/'
  art/Binary file tools/ahat/etc/L.hprof matches
  cts/Binary file tools/release-parser/tests/resources/boot-framework.art matches
  external/cpuinfo/test/dmesg/oppo-r9.log:2212:<14>[   12.785966] (6)[1:init]init: [PropSet]: pid:887 uid:1000 gid:1000 set net.qtaguid_enabled=1
  prebuilts/runtime/appcompat/hiddenapi-flags.csv:412141:Lcom/android/server/NetworkManagementSocketTagger;->PROP_QTAGUID_ENABLED:Ljava/lang/String;,blocked

Bug: 161325508
Test: atest, TreeHugger
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: Ifa30a7549396312a970fc07c37e8fa8ed85abec0
 2021-11-10 15:52:30 -08:00
satayev
f56d99f70c Merge "Update compat owners." am: 39bf2ed7e5 am: a7e21f7e63 am: 8d8bec0ebe am: 6a34d3ad15 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1886324

Change-Id: I5bcd1d14b415e3b110ef6fece19b005aec231972
 2021-11-10 16:40:57 +00:00
satayev
6a34d3ad15 Merge "Update compat owners." am: 39bf2ed7e5 am: a7e21f7e63 am: 8d8bec0ebe 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1886324

Change-Id: I7c48d880bff946f8994807775e73d7e1b9b045bc
 2021-11-10 16:23:08 +00:00
satayev
8d8bec0ebe Merge "Update compat owners." am: 39bf2ed7e5 am: a7e21f7e63 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1886324

Change-Id: I083f5358de92542a0658d348871a969ba69c9078
 2021-11-10 16:12:44 +00:00
satayev
73c5df816c Update compat owners. 
Bug: N/A
Test: N/A
Change-Id: I548b7310c7b77fbcdf3c6f7d85bde8d0129cf460
 2021-11-10 15:35:30 +00:00
Wu Ahan
d9dd71a4d7 Merge "Instrument jank of splash screen AVD and exit animation" into sc-v2-dev am: 43f59bb11b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16084829

Change-Id: If8539d0bbfe18404d5a3bd4013109bfc6ba23898
 2021-11-03 02:57:02 +00:00
Wu Ahan
43f59bb11b Merge "Instrument jank of splash screen AVD and exit animation" into sc-v2-dev 2021-11-03 02:44:08 +00:00
TreeHugger Robot
d9358f6fec Merge "Remove deadlock path between InteractionJankMonitor and FrameTracker" into sc-v2-dev am: 9de009c3a5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15828030

Change-Id: I516149ab133ca36bcc915bb9cbc65191342a8a01
 2021-11-02 15:30:19 +00:00
Ahan Wu
aac160b107 Remove deadlock path between InteractionJankMonitor and FrameTracker 
A deadlock path is found:
- FrameTracker$1.lambda$surfaceDestroyed (held A)
- InteractionJankMonitor.end (held B) -> FrameTracker.end (wait for A)
- FrameTracker.end -> InteractionJankMonitor.handleCujEvents (wait for B)
This cl resolves this by using a single lock among monitor and tracker.

Bug: 197804653
Test: atest InteractionJankMonitorTest --rerun-until-failure 100
Test: atest FrameTrackerTest --rerun-until-failure 100
Change-Id: Ia6aa196370bdb51b8a5c84c74a3d174a3d4b689f
 2021-11-02 12:23:06 +00:00
Treehugger Robot
8ec2e93056 Merge "Create dedicated long variables." am: 78106c0ea4 am: dbca2d9a1f am: 742e35e203 am: 2afff12071 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1874248

Change-Id: I1a56e7e0c2052ccd6ab6fb9316aabfc4b97f4e2b
 2021-10-29 16:04:25 +00:00
Treehugger Robot
2afff12071 Merge "Create dedicated long variables." am: 78106c0ea4 am: dbca2d9a1f am: 742e35e203 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1874248

Change-Id: I872014db65c9f1d1b1cfc0c9c6fb338fb0b3917f
 2021-10-29 15:48:38 +00:00
Treehugger Robot
742e35e203 Merge "Create dedicated long variables." am: 78106c0ea4 am: dbca2d9a1f 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1874248

Change-Id: I3c334fc91ff1e747a7eb6476cdc669b547ff23c1
 2021-10-29 15:30:53 +00:00
kwekua
5aacac2a71 Create dedicated long variables. 
Bug: 194532703
Bug: 204459169
Change-Id: Ic4c57d3797b19869e5c9151ccb183543ba5f6df0
 2021-10-28 19:33:25 +00:00
Brad Stenning
ba7d862103 Merge "Allow a shared library to be positioned after the application on the classpath" am: 3120b13f56 am: 6e2646eacd am: dfb49ce58c am: 779d574b3d 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1852914

Change-Id: I2e3425881355d2c5185038e2868b55b02867d973
 2021-10-27 22:22:20 +00:00
Brad Stenning
779d574b3d Merge "Allow a shared library to be positioned after the application on the classpath" am: 3120b13f56 am: 6e2646eacd am: dfb49ce58c 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1852914

Change-Id: Id6cf9e1e78db5f8aea040bcf51b24435a7529e0f
 2021-10-27 22:02:48 +00:00
Brad Stenning
dfb49ce58c Merge "Allow a shared library to be positioned after the application on the classpath" am: 3120b13f56 am: 6e2646eacd 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1852914

Change-Id: I6b68af9a6f028103453e4cb6e014e852ef8838d1
 2021-10-27 21:43:17 +00:00
Brad Stenning
89dfd0902e Allow a shared library to be positioned after the application on the classpath 
This is useful if/when it's desired that an application contains the same
fully qualified class name that's also in the library.

The shared libraries that are treated in this manor are controlled by the resource
com.android.internal.R.config_shared_libraries_loaded_after_app

Bug: 179429740

Test: atest SharedLibraryLoadingTests

Change-Id: Ia37ff9bd545918d1e0f1f38548dcd86f177559d5
 2021-10-27 10:06:16 -07:00
Treehugger Robot
92e4b728c7 Merge "Fix RRO loading from inside APEXes." am: de3baffb29 am: 23cd20c926 am: 09341a5ec4 am: c1ceac41b8 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1830600

Change-Id: Ie51639568f0d24c90c1e10284de0536238ab1778
 2021-10-26 23:36:17 +00:00
Treehugger Robot
c1ceac41b8 Merge "Fix RRO loading from inside APEXes." am: de3baffb29 am: 23cd20c926 am: 09341a5ec4 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1830600

Change-Id: I47f88d5567eeccdf1d19d2d337d47d168ec98bf5
 2021-10-26 23:16:06 +00:00
Treehugger Robot
09341a5ec4 Merge "Fix RRO loading from inside APEXes." am: de3baffb29 am: 23cd20c926 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1830600

Change-Id: I2d2fdda8b4f0fc6f4c9b32ca3e2e1c810b3d5384
 2021-10-26 22:46:40 +00:00
Daniel Norman
653a1c1a28 Fix RRO loading from inside APEXes. 
APEXes can already contain RRO APKs by using the 'rro' apex Soong
module field. However, these RROs were not being loaded properly by
Zygote or PackageManagerService.

For all RROs inside APEXes, the RRO uses the same overlay config that
is used for other RROs on the APEX's preinstalled partition.

For RROs targeting 'android', which are installed by Zygote
using AssetManager:
1. OverlayConfig looks for active APEXes in the apex-info-list file,
   which is already accessible to Zygote.
2. OverlayConfig passes the APEX module names to OverlayConfigParser,
   for each preinstalled-partition.
3. OverlayConfigParser uses OverlayScanner to scan the
   each /apex/<APEX>/overlay directory.

For other RROs:
1. PackageManagerService already parses and provides RROs inside APEXes
   to OverlayConfig.
2. RROs inside APEXes used to have no config rule applied because their
   path prefix (/apex/) did not match any partition rule. Now, their
   preinstalled path is used instead.

Bug: 199200417
Test: Define a static RRO targeting 'android' inside a /vendor APEX.
      Define a static RRO for settings provider inside a /vendor APEX.
      Observe APEXes are enabled by default.
Test: Make a change to an RRO inside a /vendor APEX.
      m <apex>; adb install <apex artifact>; adb reboot;
      Observe change has taken effect.
Change-Id: I2bce9bc704789329b8c6aac6d476f17ff6718e0f
Merged-In: I2bce9bc704789329b8c6aac6d476f17ff6718e0f
 2021-10-25 13:04:24 -07:00
Rahul Sabnis
01eb71be00 Merge "Adding @SystemApi annotation to Bluetooth energy stats." am: a12c77ab44 am: a125c31d21 am: f91171d35e am: 6f74b5dd8b 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1854179

Change-Id: I9e271a266c640fb739a5c394d0f5d091803143f4
 2021-10-25 17:24:00 +00:00
Rahul Sabnis
6f74b5dd8b Merge "Adding @SystemApi annotation to Bluetooth energy stats." am: a12c77ab44 am: a125c31d21 am: f91171d35e 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1854179

Change-Id: Ib49bb57260772b4200a11bb59e010ad8b8aa172e
 2021-10-25 17:09:57 +00:00
Rahul Sabnis
f91171d35e Merge "Adding @SystemApi annotation to Bluetooth energy stats." am: a12c77ab44 am: a125c31d21 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1854179

Change-Id: Id4834acb7d38f9bd98e1eb29b9be0636a2f27a73
 2021-10-25 16:53:04 +00:00
Shawn Lin
65c8136d34 Merge "Add APIs to get system bar heights" into sc-v2-dev am: 59f51a9538 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15611697

Change-Id: Ia9cb364e66ff9ef778e41d239a78da4b79e6d993
 2021-10-25 04:23:07 +00:00
Shawn Lin
59f51a9538 Merge "Add APIs to get system bar heights" into sc-v2-dev 2021-10-25 04:07:12 +00:00