Commit Graph

16634 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
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
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
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
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
Etienne Ruffieux
d372361fe3 Adding @SystemApi annotation to Bluetooth energy stats.
Added @SystemApi annotation to BluetoothActivityEnergyInfo
and UidTraffic getters for mainline compatibility. Replaced
raw array by List. Deleted unused constructors.

Tag: #feature
Bug: 200201373
Test: Manual
Change-Id: Id93215f48bf08d31ac269af9e064cf598f50b6d3
2021-10-21 20:39:31 +00:00
TreeHugger Robot
bfe149f2ed Merge "Zero out WiFi duration and power if ControllerActivityCounter is null" into sc-qpr1-dev am: c410f29893
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15934611

Change-Id: Iee9dbf00b4568400c319a348587018bfa3e6fb77
2021-09-29 00:43:25 +00:00
Xin Li
8891d70334 Merge SP1A.210812.016
Merged-In: I8b62b9b9d7ae271bc623764d545db1320b4dc64f
Change-Id: I458ed7f2eb8603f5e89c1d73bc0f0d52b826973e
2021-09-28 19:26:36 +00:00
Dmitri Plotnikov
fb10be47c9 Zero out WiFi duration and power if ControllerActivityCounter is null
Bug: 200346841
Test: atest FrameworksCoreTests:WifiPowerCalculatorTest
Change-Id: I087e3b60c277c1d1a63b6c06e60ffcbe95224668
(cherry picked from commit 199f93ac3b)
2021-09-28 17:20:34 +00:00
Varun Shah
12c61b00c0 Merge "Dismiss the suspend dialog if conditions have been modified." into sc-qpr1-dev am: 912d89451a
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15853562

Change-Id: Ieead99da9e0ed20b30b9add94c8003ae69ef9424
2021-09-24 18:07:21 +00:00
Varun Shah
912d89451a Merge "Dismiss the suspend dialog if conditions have been modified." into sc-qpr1-dev 2021-09-24 17:54:45 +00:00
TreeHugger Robot
4ff921f559 Merge "Check custom component names before aggregating BatteryUsageStats snapshots" into sc-qpr1-dev am: 0ef5152b17
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15872124

Change-Id: Ib40da10e9db2ee290e1c65681e25862b0c6b7e35
2021-09-20 20:51:11 +00:00
Dmitri Plotnikov
0c561475c3 Check custom component names before aggregating BatteryUsageStats snapshots
If the lists of custom power components do not match, a crash will occur.
Instead of causing a crash, simply skip incompatible snapshots.

Bug: 196040329
Bug: 200511361
Test: atest FrameworksCoreTests:com.android.internal.os.BatteryUsageStatsProviderTest

Change-Id: I87ba605371a5f3119dcff33f6109e94ee46ab57d
(cherry picked from commit a1ea9ecd56)
2021-09-20 18:35:09 +00:00
Dmitri Plotnikov
e4cc934175 Drop per-app measured energy when an OTA changes the set of energy components am: 50348e3120
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15857253

Change-Id: I509be3ae6643864524529c06a61229c11b0ae008
2021-09-18 03:53:48 +00:00
Dmitri Plotnikov
50348e3120 Drop per-app measured energy when an OTA changes the set of energy components
Bug: 200123115
Test: atest BatteryStatsTests
Change-Id: I750a5c9fa3faa9757625b2d2494df1484b68016d
(cherry picked from commit 9cb960304e)
2021-09-17 23:10:56 +00:00
Varun Shah
777d87f91b Dismiss the suspend dialog if conditions have been modified.
Whenever suspension conditions change, if there is a user-visible
suspension-related dialog, dismiss it to ensure the user is never
looking at stale information.

Bug: 169137795
Test: atest SuspendPackagesBroadcastTest#sendPackagesSuspendModifiedForUser
Test: manual (steps below)
-enable EBS, tap on suspended app to see dialog
-enable Focus mode, ensure dialog is dismissed
-tap on suspended app again to see relevent dialog,
 disable Focus mode, ensure dialog is dismissed
-tap on suspended app again to see relevant dialog,
 disable EBS, ensure dialog is dismissed correctly
-can permute enable/disable steps to further verify

Change-Id: Ib1650f910f7441498424ab4bc92185ce432ac405
(cherry picked from commit 25e73a8b9e)
2021-09-17 22:35:26 +00:00
Bernardo Rufino
5a2619c678 Merge "Remove sendCloseSystemDialogs() from PhoneFallbackEventHandler" into sc-qpr1-dev am: d9ba2df119
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15836011

Change-Id: I9a03f509116603c2286b2c385af4587bd8dd9b09
2021-09-17 15:29:37 +00:00
Bernardo Rufino
d9ba2df119 Merge "Remove sendCloseSystemDialogs() from PhoneFallbackEventHandler" into sc-qpr1-dev 2021-09-17 15:15:48 +00:00
Miranda Kephart
0d5e670809 Merge "Fix direct share badges when sharing on work/personal profiles" into sc-qpr1-dev am: b51d58e6fd
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15839049

Change-Id: I4ff949f7732fd4915b835e33a466165ab9d3c4f4
2021-09-16 14:03:52 +00:00
Miranda Kephart
63fe7d7343 Fix direct share badges when sharing on work/personal profiles
Use the passed-in user instead of the current user to determine
whether or not to add the work profile badge to direct share
target app icons, so that personal share targets do not have the
badge (even when sharing something from the work profile) and
work/managed share targets do have it (even when sharing something
from the personal profile).

Test: manual; tested appearance sharing from personal->work and
from work->personal
Bug: 197388251
Fix: 197388251

Change-Id: Ieee50d46e8058a92efa5be8aae9859447531c270
2021-09-15 15:20:14 -04:00
Bernardo Rufino
1538b7fda7 Remove sendCloseSystemDialogs() from PhoneFallbackEventHandler
Today's flow of events is like this: key goes to focused app
(ViewRootImpl::processKeyEvent), the view hierarchy does not handle the
event, so ViewRootImpl uses FallbackEventHandler to invoke the fallback
action for this key.

The problem is that for many keys the app itself is closing system
dialogs before taking the appropriate action (often launching an
activity, eg. dialer for KEYCODE_CALL), but this is now prohibited in S
due to abuse of said action.

The long-term plan is to return to InputDispatcher the fact that the key
wasn't handled by the app and have ID call out to the policy, which will
launch the appropriate action and adjust the UI as it sees fit (close
system dialogs).

However, we need to prevent apps from crashing because of this, hence
this change for S still. The unfortunate effect is that system dialogs
won't be hidden in these cases, but this livable with until we properly
implement the infrastructure.

Bug: 199173862
Test: Simulate code-paths with affected keys and make sure apps don't
      crash:
      1. adb shell input keyevent --longpress KEYCODE_CALL
      2. adb shell input keyevent --longpress KEYCODE_CAMERA
Change-Id: I44ad41ac1eac9acc8320298ceb4c1b21bde8af5d
2021-09-15 15:25:47 +01:00
Pavel Grafov
a9a29b6ffe Merge "Respect PASSWORD_QUALITY_MANAGED for biometrics" into sc-qpr1-dev am: a238881ee0
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15778512

Change-Id: I7dd1ea2b9c10a2410917fe89fb50ad8a17f2c3ea
2021-09-13 14:09:29 +00:00
Pavel Grafov
a238881ee0 Merge "Respect PASSWORD_QUALITY_MANAGED for biometrics" into sc-qpr1-dev 2021-09-13 13:52:26 +00:00
Dmitri Plotnikov
58214c18dd Merge "Add OWNERS for BatteryStats related files" am: a84bdc93a8 am: cc225325e3 am: e69a707085
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1822145

Change-Id: Iedc246526e371342096d6e3354b0e742bd4c855c
2021-09-10 18:56:26 +00:00
Dmitri Plotnikov
e69a707085 Merge "Add OWNERS for BatteryStats related files" am: a84bdc93a8 am: cc225325e3
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1822145

Change-Id: I531bd2c8da470bbde94135dfdddc425de5dbbf9c
2021-09-10 18:41:20 +00:00