Commit Graph

18636 Commits

Author SHA1 Message Date
Mark Renouf
3008a333f6 Merge "Removes unused inheritence avoidance hacks" into tm-dev am: 3ad19f7a7c
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17140040

Change-Id: Ic530287adddd24d52bd8a128bacbd0f7d14a0e0e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-30 21:57:49 +00:00
Mark Renouf
3ad19f7a7c Merge "Removes unused inheritence avoidance hacks" into tm-dev 2022-03-30 17:19:43 +00:00
Mark Renouf
0d46d330e9 Merge "Removes unused mAwaitingDelegateResponse" into tm-dev am: ca3d495ca6
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17140039

Change-Id: Ib152c2bc14b1858e0958a807c31710e81318d1a6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-30 10:38:04 +00:00
Mark Renouf
74a1c4fa7c Merge "Replace USE_DELEGATE_CHOOSER with USE_UNBUNDLED_SHARESHEET" into tm-dev am: af657c9fad
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17200872

Change-Id: I74ab236059664322297c47c42217439803efd050
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-30 10:36:52 +00:00
Mark Renouf
ca3d495ca6 Merge "Removes unused mAwaitingDelegateResponse" into tm-dev 2022-03-30 10:21:13 +00:00
TreeHugger Robot
72338c3f8e Merge "Fall back when failing to load size restricted icon" into tm-dev am: 44df60c3f9
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17366541

Change-Id: I3b42a19319029819f01e14b3b828d8348b46178a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-29 23:43:39 +00:00
Matt Casey
cb9d8762c3 Replace USE_DELEGATE_CHOOSER with USE_UNBUNDLED_SHARESHEET
New flag will allow for control via experiment rollout.

Bug: 224544763
Test: Manual test of flag functionality.
Change-Id: I70bc79e12afe4ff629dbd3935c082c51c39a66a7
2022-03-29 23:40:09 +00:00
TreeHugger Robot
44df60c3f9 Merge "Fall back when failing to load size restricted icon" into tm-dev 2022-03-29 23:33:39 +00:00
TreeHugger Robot
93ac91554a Merge "Fix mobile radio battery consumption double counting" into sc-v2-dev am: f709e34b90 am: 9d9976b68f
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17206575

Change-Id: I9c301bd9e347fedaa1a04ce8f2e50fda402ece4d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-29 20:54:57 +00:00
TreeHugger Robot
9d9976b68f Merge "Fix mobile radio battery consumption double counting" into sc-v2-dev am: f709e34b90
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17206575

Change-Id: I472e4dc6a9b0ae0f8f76e2b620ec59e53aba0b3a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-29 20:39:43 +00:00
TreeHugger Robot
f709e34b90 Merge "Fix mobile radio battery consumption double counting" into sc-v2-dev 2022-03-29 20:19:40 +00:00
Mark Renouf
bcc5667fa9 Merge changes from topics "presubmit-am-0adc4a89a1534fb8873a721309ac084a", "presubmit-am-f0e20c2f5d9d42f5b21d0cb6ae2e15cd" into tm-dev am: b3729dc001
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17138877

Change-Id: Ib6a9e28d434eaabd00ed485682ae022f60035ee0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-29 19:36:08 +00:00
Mark Renouf
b3729dc001 Merge changes from topics "presubmit-am-0adc4a89a1534fb8873a721309ac084a", "presubmit-am-f0e20c2f5d9d42f5b21d0cb6ae2e15cd" into tm-dev
* changes:
  Removes 'mIsHeadlessSpringboardActivity'
  Remove 'startAsCallerImpl' refactoring relic
2022-03-29 19:07:20 +00:00
Kholoud Mohamed
d705e2c8ae Merge "RESTRICT AUTOMERGE Refactor device policy resource APIs to a separate class" 2022-03-29 11:01:20 +00:00
Thiébaud Weksteen
be722d130f Merge "Transition PlatformCompat to @EnforcePermission" 2022-03-29 06:08:18 +00:00
Tiger Huang
72bb62d920 Merge "Send InsetsState to the client via IWindow#resized" into tm-dev am: 5b19a1584a
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17352245

Change-Id: Icb1133a84c150eaa292b63b97ba2b65b88d6b005
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-26 04:14:45 +00:00
kholoud mohamed
284246f7e6 RESTRICT AUTOMERGE Refactor device policy resource APIs to a separate class
Bug: 217388602
Bug: 218875965
Test: atest EnterpriseResourcesTests
Test: manual
Change-Id: I8af03136e67057d171e97cb5a43187aa6c7f4fe7
(cherry picked from commit b7aedc6f3d)
Merged-In: I8af03136e67057d171e97cb5a43187aa6c7f4fe7
2022-03-25 16:14:51 +00:00
Tiger Huang
bc1d8093db Send InsetsState to the client via IWindow#resized
In some cases, the InsetsState and the window frame can be changed at
the same time (such as orientation changed). Reporting them separately
might produce incorrect insets.

When the window layout is moved to the client, it uses the configuration
and the InsetsState to compute the window frame. They need to be
reported together as well.

Bug: 161810301
Bug: 160732586
Test: atest ActivityRecordTests WindowStateTests
Test: Add logs to check if we dispatch the correct insets to apps while
      rotating the display.
Change-Id: I5c9f628eda40932def97c5caf968cb62db128e80
2022-03-25 12:39:18 +08:00
Mark Renouf
f7dffbe0b3 Merge "Remove permission token from startActivityAsCaller" into tm-dev am: fe4b81853e
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17108066

Change-Id: I9c1029682eec0cb51f26b9724040a52e83b5bc86
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-25 02:42:33 +00:00
Mark Renouf
fe4b81853e Merge "Remove permission token from startActivityAsCaller" into tm-dev 2022-03-25 02:32:08 +00:00
TreeHugger Robot
48709c6565 Merge "Utilize specific info provided by the Modem HAL" into tm-dev 2022-03-24 22:21:56 +00:00
TreeHugger Robot
83d48ca997 Merge changes from topic "presubmit-am-89d98d11795045fea0a8183aa64fee5f"
* changes:
  [automerge] Utilize specific info provided by the Modem HAL 2p: adfc51a554 2p: 700b2aeed7
  [automerge] Utilize specific info provided by the Modem HAL 2p: adfc51a554
  Utilize specific info provided by the Modem HAL
2022-03-24 22:21:56 +00:00
Garfield Tan
e764041142 Fall back when failing to load size restricted icon
Bug: 226295380
Test: Notification still looks good.
Change-Id: Iff1b5ea18253bdc660731382da961f6b99ba33bd
2022-03-24 17:40:36 +00:00
TreeHugger Robot
cc795ca5f3 Merge "Update the strings to match the Figma mock" into tm-dev am: ce24f91981
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17117243

Change-Id: Ic72dd9c1aad7919063063017e26cc293f48d7ea7
2022-03-24 17:34:56 +00:00
TreeHugger Robot
ce24f91981 Merge "Update the strings to match the Figma mock" into tm-dev 2022-03-24 17:18:35 +00:00
Aleksandr Litovchenko
275d01585d Merge "Extract LockPatternView animation parameters." into tm-dev am: 7bff9fc3d2
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17196746

Change-Id: I95798a199015bf6f5e11bc62c48eb4f18097a88a
2022-03-24 15:58:11 +00:00
Aleksandr Litovchenko
7bff9fc3d2 Merge "Extract LockPatternView animation parameters." into tm-dev 2022-03-24 15:51:31 +00:00
Dmitri Plotnikov
d877104446 Merge "Lock BatteryUsageStats snapshot directory" into tm-dev am: c10248df56
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17304583

Change-Id: I050aad7f315a9c0e0936655c27d25908a4003cbd
2022-03-24 15:38:11 +00:00
Dmitri Plotnikov
c10248df56 Merge "Lock BatteryUsageStats snapshot directory" into tm-dev 2022-03-24 15:29:52 +00:00
Aleksandr Litovchenko
e742fd3be3 Extract LockPatternView animation parameters.
Move lock_pattern_line_fade_out_duration and lock_pattern_line_fade_out_delay to resources in order to override it for different devices.

Tests: manually
Bug: 204870856
Bug: 199436708
Change-Id: I758871d2d7ea62bd0ad55f83fc39b6d916cb2bba
(cherry picked from commit 7520086bd06737c00772a4526df637156fb983dd)
2022-03-24 11:18:07 +00:00
TreeHugger Robot
f14fafe7d0 Merge "Revert "Use new T activity transitions in legacy"" into tm-dev am: 44f3f74955
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17353105

Change-Id: Id456ed52222f71d1cd70c1f98604430c92c46537
2022-03-24 07:54:07 +00:00
TreeHugger Robot
44f3f74955 Merge "Revert "Use new T activity transitions in legacy"" into tm-dev 2022-03-24 07:27:39 +00:00
Michael Wachenschwanz
90497c17a2 [automerge] Utilize specific info provided by the Modem HAL 2p: adfc51a554 2p: 700b2aeed7
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17185841

Bug: 207697945
Change-Id: I7101c2045ee86ada0fa9e31734928794f0821526
2022-03-24 01:39:07 +00:00
Michael Wachenschwanz
adfc51a554 Utilize specific info provided by the Modem HAL
ModemActivityInfo can now include Radio Access Technology specific information, if the HAL supports it.
If available, utilize the information.

Bug: 207697945
Test: atest BatteryStatsNoteTest
Change-Id: Ifbd3c8cca7baa35cbccf64883ae5ce87ae39ab74
2022-03-23 18:37:50 -07:00
Lais Andrade
55b9467f70 Merge "Fix PIN lock pattern not respecting user settings" into tm-dev am: 352d8d7abe
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17320107

Change-Id: I9d6b5ec4c40c9bb7a201d7b5acda1d56b9a9d8f2
2022-03-24 00:49:15 +00:00
Pablo Gamito
1250be73c8 Revert "Use new T activity transitions in legacy"
This reverts commit e0ce996ecc.

Reason for revert: Edge extension is likely causing segfaults

Change-Id: Id53e4b7e10e0509742bef4b48263b5c58e06baed
2022-03-23 22:35:26 +00:00
Michael Wachenschwanz
b1b7910ff4 Merge "Ref count isolated uid use for long partial wakelocks" into sc-v2-dev 2022-03-23 21:12:01 +00:00
Michael Wachenschwanz
bd1eff5cef Merge changes from topic "presubmit-am-7620ad0417cd498ea02e09cd0ecc98e9" into sc-v2-dev-plus-aosp
* changes:
  [automerge] Ref count isolated uid use for long partial wakelocks 2p: f548942f3f
  Ref count isolated uid use for long partial wakelocks
2022-03-23 21:12:01 +00:00
Michael Wachenschwanz
7dd534b98a Merge "Ref count isolated uid use for long partial wakelocks" into tm-dev 2022-03-23 20:25:44 +00:00
Lais Andrade
352d8d7abe Merge "Fix PIN lock pattern not respecting user settings" into tm-dev 2022-03-23 18:36:58 +00:00
TreeHugger Robot
d53d398625 Merge changes from topic "presubmit-am-b147b224dae54740a8f3d8017cf416c9-sc-v2-dev" into sc-v2-dev-plus-aosp
* changes:
  [automerge] Fix ServiceConnector failing unbind if not connected. 2p: efc50877d2
  Fix ServiceConnector failing unbind if not connected.
2022-03-23 18:35:38 +00:00
Mark Renouf
f9179a9354 Removes unused inheritence avoidance hacks
Change-Id: Ied80d8fc3b12aa5503ba6c4f01063cea4f2cf7ea
2022-03-23 14:55:53 +00:00
Mark Renouf
871b78954a Removes unused mAwaitingDelegateResponse
These are leftovers from the 'springboard' approach in ChooserActivity
and ResolverActivity.

Change-Id: I11025165dae1e855781b5a59c46e0ffa3d768cfd
2022-03-23 14:55:46 +00:00
Mark Renouf
3782660d73 Removes 'mIsHeadlessSpringboardActivity'
Leftovers from delegate/springboard refactoring path

Change-Id: I5557cae095a112a1e122a1edf7dac07d42feca4e
2022-03-23 14:55:39 +00:00
Mark Renouf
7da1e7d30c Remove 'startAsCallerImpl' refactoring relic
Change-Id: Ica2a2dc2bf1bc758349f02d685738c2c844b566f
2022-03-23 14:55:32 +00:00
Mark Renouf
05a2ef2647 Remove permission token from startActivityAsCaller
The call is protected by the signature permission
START_ACTIVITY_AS_CALLER. This will remove the need for additional data
to be passed from system server.

Bug: 222082547
Bug: 226354782
Test: atest ActivityTaskManagerServiceTests, atest ChooserActivityTest,
      manual testing
Change-Id: I94f34a68e390569ec14dfebb1902a7c30558864f
2022-03-23 14:55:01 +00:00
Rambo Wang
72f706f60a Merge "Introduce CarrierPrivilegesCallback to replace CarrierPrivilegesListener" am: cabb6b9362 am: 592bab637d
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2037268

Change-Id: I33770b31f15362225e0190557afbbdda144f742f
2022-03-23 14:26:27 +00:00
Presubmit Automerger Backend
34f0951f96 [automerge] Fix ServiceConnector failing unbind if not connected. 2p: efc50877d2
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17321988


Change-Id: If7c0bf7ab6c89e98bdecbc1ef98bf93313fa8176
Merged-In: I6a8c01390130bcec9aff1460004343ca2b207031
2022-03-23 09:33:53 +00:00
Ahaan Ugale
efc50877d2 Fix ServiceConnector failing unbind if not connected.
ServiceConnector does not call unbindService when requested to unbind if
the service isn't currently connected. This causes issues like leaving
zombie Trusted Hotword processes bound forever if the process is stopped
('restarted') immediately after being created (say if audio server
crashes twice in quick succession).

Fix: 223845998
Test: manual - locally comment out code that immediately connects the
 service, then `for i in {1..10}; do adb shell cmd voiceinteraction\
 restart-detection; done` - without fix results in an extra process
Change-Id: I6a8c01390130bcec9aff1460004343ca2b207031
Merged-in: I6a8c01390130bcec9aff1460004343ca2b207031
(cherry picked from commit 52e0dafcb3)
2022-03-23 09:33:37 +00:00
Rambo Wang
aa1e3b0a67 Introduce CarrierPrivilegesCallback to replace CarrierPrivilegesListener
Add new interface in CarrierPrivilegesCallback to notify the registrants
that carrier service for current user has changed.

Reshape the parameters of onCarrierPrivilegesChanged callback with
both Set instead of List/Array.

CarrierPrivilegesListener is deprecated. Once all clients have migrated
to CarrierPrivilegesCallback, it will be throughly cleaned up.

Bug: 216549778
Test: atest CarrierPrivilegesTrackerTest CarrierServiceTest
Test: atest WifiCarrierInfoManagerTest TelephonyRegistryManagerTest
Test: atest TelephonySubscriptionTrackerTest

Change-Id: I18e443d91f1db951f1461511821c0f5f673da3a3
Merged-In: I38d03e3921112c313f3c1d204ed04f6e1756ff39
(cherry picked from commit b66e3e3aa8)
2022-03-22 20:45:05 -07:00