Commit Graph

17687 Commits

Author SHA1 Message Date
Maciej Żenczykowski
fe2dfc5037 Merge "switch to using OWNERS from master branch of Connectivity module" am: b86ab4ae44 am: 0700ad89f8 am: 95b11d997d am: 9dab125ae7
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1894917

Change-Id: Iab231e59251cc81f93dc48aed37e54e1cf7f4f33
2021-11-17 22:57:47 +00: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
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
Dmitri Plotnikov
03fca4a0ef Merge "Reduce object allocation in procstate CPU attribution" 2021-11-16 21:10:12 +00:00
Treehugger Robot
0bc08965b2 Merge "Fix typo in BaseIWindow.java owners file" am: b2f814064e am: 6d5a079682 am: 063df04968 am: 2d3bb1c042
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1893295

Change-Id: I2c26d2b1d978fe2e03388a6ce72480caf9c6896b
2021-11-16 18:48:14 +00: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
295e48eb99 Merge "remove PROP_QTAGUID_ENABLED" am: 999147b4ab am: 8d888d92ed am: b3135ed72d am: fa6d0cfdb1
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1888335

Change-Id: I74c9ca7b74391d9c365ba39e4ad8471f827c7f0c
2021-11-16 05:05:54 +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
Antonio Kantek
abb67140e4 Merge "TouchMode (6.1/n) Fully detaching touch mode from focus event" 2021-11-16 01:32:17 +00:00
Vishnu Nair
8cd9256c50 Fix typo in BaseIWindow.java owners file
Change-Id: I7ea7fb4a9fc16aa007e4a6970d550f906da202f7
2021-11-15 23:38:05 +00:00
Ronish Kalia
55e30f38af Merge changes from topic "qr-code-and"
* changes:
  Add tests for QRCodeScannerController
  Add tests for QRCodeScannerTile
  Add a lock screen entry point for QR Code scanner
  Add settings keys for QR code scanner settings
  Add a quick settings entry point for QR Code Scanner
  Create a controller for QR Code Scanner in android
2021-11-15 16:35:44 +00:00
Wu Ahan
a7c80fad92 Merge "Add null check before notifying CUJ events" into sc-v2-dev am: 60316d327f am: 12b1a2ef2e
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16221675

Change-Id: I545d7f82708ae23f89f93284066290201af28367
2021-11-13 05:02:25 +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
Dmitri Plotnikov
72e63c66a4 Reduce object allocation in procstate CPU attribution
Bug: 197162116
Test: atest FrameworksCoreTests:BatteryStatsTests
Change-Id: Iee0ed61305248f69943a8e4a6c9baacdd523df0c
2021-11-12 17:37:00 -08:00
Dmitri Plotnikov
022404820c Merge "Fix CPU active time counter for isolated UIDs" 2021-11-13 01:15:21 +00:00
Dmitri Plotnikov
922617d834 Fix CPU active time counter for isolated UIDs
Bug: 204087731
Test: atest FrameworksCoreTests:BatteryStatsTests
Change-Id: Ia7bd13aecd9c7c7321d1c6d6ea99beaed60f7e90
2021-11-12 15:26:47 -08: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
Antonio Kantek
d30cab4e6d TouchMode (6.1/n) Fully detaching touch mode from focus event
Note: ScreenshotTests properly exercises both IWindow#onFocusEvent and
JNI InputEventReceiver.

Bug: 193718270
Test: atest FrameworksCoreTests:ViewRootImplTest
Test: atest com.android.server.wm.ScreenshotTests
Test: atest FrameworksCoreTests
Test: atest CtsInputMethodTestCases
Test: atest CtsInputTestCases
Test: atest CtsSecurityTestCases
Test: atest CtsWindowManagerDeviceTestCases
Change-Id: I63d973978a048498e59c8df34f624b623e8e9289
2021-11-12 02:25:58 +00:00
TreeHugger Robot
1754ce16f7 Merge "Remove isMultiClientImeEnabled from SystemUI" 2021-11-11 19:54:35 +00:00
ronish
c94f29e424 Create a controller for QR Code Scanner in android
This change adds a new controller that can enable/disable the entry
points for invoking a generic QR code scanner. This controller manages
the following:
1. Enabling/disabling the lock screen entry point
2. Enabling/disabling the quick settings entry point
3. Enabling/disabling the settings for lock screen entry point
4. Any changes to the QR code scanner device config

Bug: 200536509
Test: atest QRCodeScannerControllerTest

Change-Id: I6d1001e7597576f39f51f8cf4ef763fcc253423c
2021-11-11 12:21:44 +00:00
Wilson Wu
499e66b2d1 Remove isMultiClientImeEnabled from SystemUI
The Multi-Client IME was removed by CL[1].

We no longer need the the isMultiClientImeEnabled
related logic in SystemUI. Remove it for code health.

[1]: I0bdc8fe3d32ccabc8ea7996fc689543c3f99331a

Bug: 173341412
Fix: 205863279
Test: Build and flash
Change-Id: I042d40623ed34251a212fbf25f72de5647b88835
2021-11-11 16:32:30 +08:00
Nikolas Havrikov
b4e58c354b Merge "Add WINDOW_GAINED_FOCUS to IntDef annotation" 2021-11-11 08:27:55 +00:00
Calvin Pan
c84134d2b2 Merge "Support IME to take extra information to editor" 2021-11-11 02:26:21 +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
Nikolas Havrikov
4a93fae0d6 Add WINDOW_GAINED_FOCUS to IntDef annotation
This CL adds the missing WINDOW_GAINED_FOCUS annotation to the
StartInputFlags IntDef declaration to avoid compiler warnings such as
the one in IMMS#startInputOrWindowGainedFocusInternalLocked.

Also, this CL replaces decimals with bit-shift expressions as per AOSP
style guide.

Test: make
Bug: 205676419
Change-Id: I51fe293149d6f7fab5790d13764449d62cbdb668
2021-11-10 17:10:28 +00:00
satayev
f6810b1b94 Merge "Update compat owners." am: 39bf2ed7e5 am: a7e21f7e63 am: 8d8bec0ebe am: 6a34d3ad15 am: f56d99f70c
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1886324

Change-Id: Iae6cdcd6b73224063d9b362865988848a70cdef0
2021-11-10 16:59:36 +00: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
TreeHugger Robot
69c0e81d1d Merge "DeviceConfig flag to guard delegate chooser flow." 2021-11-09 20:40:51 +00:00
Joshua Trask
237b8372b7 DeviceConfig flag to guard delegate chooser flow.
This replaces the ad-hoc hard-coded flag that previously
guarded the delegation flow, and updates the config to
point to the new delegate component. Note this is still
the Phase 2 ("Delegation Trials") architecture from
go/sharesheet-unbundling-phases which delegates to the
new component only for the final step of dispatching the
user's selected target. When the new component takes
responsibility for displaying the Sharesheet UI (Phase 3)
we'll use the same DeviceConfig flag to guard the new
logic to delegate out from earlier on in the system
activity lifecycle.

I was able to test this manually (once I eventually
figured out how to get the new unbundled APK installed),
by going through Sharesheet and confirming that the
delegate activity (at the new path) is only invoked after
overriding the flag by:

adb shell device_config put systemui use_delegate_chooser true

An upcoming CL will add the server-side config that we
can use to control this experiment.

Bug: 202166034
Test: manual (as described above)
Change-Id: Ie3eb5bca6b768383156293cddbf6932df2cd3a64
2021-11-09 12:00:17 -05:00
Calvin Pan
c33444b736 Support IME to take extra information to editor
Add the TextAttribute class and variant of setComposingText(),
setComposingRegion(), commitText() to support IME to take extra
information to editor.

Bug: 198732184
Test: atest  CtsInputMethodTestCases:InputConnectionEndToEndTest CtsInputMethodTestCases:TextAttributeTest
Change-Id: Ic9c917b70726ca32c2097b0374951c20af9624c4
2021-11-09 21:23:54 +08:00
Antonio Kantek
5d9adbcb7b Roll forward of "Revert "TouchMode (5/n) Implementing onTouchModeChanged""
This reverts commit 8e8e721f61.

Reason for revert: ViewRootImpl#windowFocusChanged to also change touch
mode.

Fixes: 173468133
Bug: 193718270
Test: atest FrameworksCoreTests CtsWindowManagerDeviceTestCases

Change-Id: I21780b86574c395cd6c2c5c05a88078c050edb8c
2021-11-04 14:04:57 -07:00
Miranda Kephart
f50afcbabb Don't show nested badge for work profile direct share targets
Currently, we add a work badge (briefcase icon) to app icons in
the sharesheet. If the target is an app, this results in the
regular app icon with a work badge. However, for direct share
targets we show the person, with the app icon as a badge. This
means that for direct share targets, we show an app icon badge
that itself has a (very tiny) work profile badge.

This change removes the "nested" work profile badge for direct
share targets.

Bug: 179783660
Fix: 179783660
Test: manual (shared something and verified that no direct share
targets have a work profile badge, but work profile apps are still
badged)

Change-Id: I5196184a6f1fb442eee905240656faa6c9fc4cfb
2021-11-04 11:45:48 -04:00
Wu Ahan
807047352c Merge "Instrument jank of splash screen AVD and exit animation" into sc-v2-dev am: 43f59bb11b am: d9dd71a4d7
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16084829

Change-Id: I04e420e50cb9895f9f8ca181cc5ecbc2750bb2fd
2021-11-03 03:08:35 +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
f70e2f4880 Merge "Avoid autoboxing." 2021-11-02 16:17:08 +00:00
TreeHugger Robot
a2175c42ca Merge "Remove deadlock path between InteractionJankMonitor and FrameTracker" into sc-v2-dev am: 9de009c3a5 am: d9358f6fec
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15828030

Change-Id: I3d4c9d4e3f96c68c7aa4ebac4235a528bb78f901
2021-11-02 15:43:46 +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
Dmitri Plotnikov
6b93377684 Merge "Use per process state CPU Active time in CpuPowerCalculator" 2021-11-01 22:55:51 +00:00
TreeHugger Robot
048b74a0d5 Merge "Avoid autoboxing." 2021-11-01 18:34:05 +00:00
Dmitri Plotnikov
47e5825623 Use per process state CPU Active time in CpuPowerCalculator
Bug: 191921016
Test: atest FrameworksCoreTests:BatteryStatsTests
Change-Id: I6ebbbacb35815fa30392628f7e5a30add365b21f
2021-11-01 17:05:06 +00:00
Dmitri Plotnikov
3b367873a0 Merge "Update CpuPowerCalculator to do per process state attribution" 2021-11-01 17:04:29 +00:00