[text] space

Viewer

  1. [email protected]:~/Desktop/forked/frameworks_base$ git merge android-security-11.0.0_r61 --strategy-option theirs
  2. Auto-merging core/java/android/app/ActivityManagerInternal.java
  3. Auto-merging core/java/android/app/INotificationManager.aidl
  4. Auto-merging core/java/android/app/Notification.java
  5. Auto-merging core/java/android/app/admin/DevicePolicyManager.java
  6. Auto-merging core/java/android/app/admin/DevicePolicyManagerInternal.java
  7. Auto-merging core/java/android/app/slice/SliceProvider.java
  8. Auto-merging core/java/android/bluetooth/BluetoothDevice.java
  9. Auto-merging core/java/android/content/pm/PackageInstaller.java
  10. Auto-merging core/java/android/content/pm/parsing/ParsingPackageImpl.java
  11. Auto-merging core/java/android/content/pm/parsing/ParsingPackageUtils.java
  12. Auto-merging core/java/android/os/Process.java
  13. Auto-merging core/java/android/view/inputmethod/InputMethodManager.java
  14. Auto-merging core/java/com/android/internal/app/ResolverActivity.java
  15. Auto-merging core/java/com/android/internal/util/ScreenshotHelper.java
  16. Auto-merging core/res/AndroidManifest.xml
  17. Auto-merging core/res/res/values-af/strings.xml
  18. Auto-merging core/res/res/values-am/strings.xml
  19. Auto-merging core/res/res/values-ar/strings.xml
  20. Auto-merging core/res/res/values-as/strings.xml
  21. Auto-merging core/res/res/values-az/strings.xml
  22. Auto-merging core/res/res/values-b+sr+Latn/strings.xml
  23. Auto-merging core/res/res/values-be/strings.xml
  24. Auto-merging core/res/res/values-bg/strings.xml
  25. Auto-merging core/res/res/values-bn/strings.xml
  26. Auto-merging core/res/res/values-bs/strings.xml
  27. Auto-merging core/res/res/values-ca/strings.xml
  28. Auto-merging core/res/res/values-cs/strings.xml
  29. Auto-merging core/res/res/values-da/strings.xml
  30. Auto-merging core/res/res/values-de/strings.xml
  31. Auto-merging core/res/res/values-el/strings.xml
  32. Auto-merging core/res/res/values-en-rAU/strings.xml
  33. Auto-merging core/res/res/values-en-rCA/strings.xml
  34. Auto-merging core/res/res/values-en-rGB/strings.xml
  35. Auto-merging core/res/res/values-en-rIN/strings.xml
  36. Auto-merging core/res/res/values-en-rXC/strings.xml
  37. Auto-merging core/res/res/values-es-rUS/strings.xml
  38. Auto-merging core/res/res/values-es/strings.xml
  39. Auto-merging core/res/res/values-et/strings.xml
  40. Auto-merging core/res/res/values-eu/strings.xml
  41. Auto-merging core/res/res/values-fa/strings.xml
  42. Auto-merging core/res/res/values-fi/strings.xml
  43. Auto-merging core/res/res/values-fr-rCA/strings.xml
  44. Auto-merging core/res/res/values-fr/strings.xml
  45. Auto-merging core/res/res/values-gl/strings.xml
  46. Auto-merging core/res/res/values-gu/strings.xml
  47. Auto-merging core/res/res/values-hi/strings.xml
  48. Auto-merging core/res/res/values-hr/strings.xml
  49. Auto-merging core/res/res/values-hu/strings.xml
  50. Auto-merging core/res/res/values-hy/strings.xml
  51. Auto-merging core/res/res/values-in/strings.xml
  52. Auto-merging core/res/res/values-is/strings.xml
  53. Auto-merging core/res/res/values-it/strings.xml
  54. Auto-merging core/res/res/values-iw/strings.xml
  55. Auto-merging core/res/res/values-ja/strings.xml
  56. Auto-merging core/res/res/values-ka/strings.xml
  57. Auto-merging core/res/res/values-kk/strings.xml
  58. Auto-merging core/res/res/values-km/strings.xml
  59. Auto-merging core/res/res/values-kn/strings.xml
  60. Auto-merging core/res/res/values-ko/strings.xml
  61. Auto-merging core/res/res/values-ky/strings.xml
  62. Auto-merging core/res/res/values-lo/strings.xml
  63. Auto-merging core/res/res/values-lt/strings.xml
  64. Auto-merging core/res/res/values-lv/strings.xml
  65. Auto-merging core/res/res/values-mk/strings.xml
  66. Auto-merging core/res/res/values-ml/strings.xml
  67. Auto-merging core/res/res/values-mn/strings.xml
  68. Auto-merging core/res/res/values-mr/strings.xml
  69. Auto-merging core/res/res/values-ms/strings.xml
  70. Auto-merging core/res/res/values-my/strings.xml
  71. Auto-merging core/res/res/values-nb/strings.xml
  72. Auto-merging core/res/res/values-ne/strings.xml
  73. Auto-merging core/res/res/values-nl/strings.xml
  74. Auto-merging core/res/res/values-or/strings.xml
  75. Auto-merging core/res/res/values-pa/strings.xml
  76. Auto-merging core/res/res/values-pl/strings.xml
  77. Auto-merging core/res/res/values-pt-rBR/strings.xml
  78. Auto-merging core/res/res/values-pt-rPT/strings.xml
  79. Auto-merging core/res/res/values-pt/strings.xml
  80. Auto-merging core/res/res/values-ro/strings.xml
  81. Auto-merging core/res/res/values-ru/strings.xml
  82. Auto-merging core/res/res/values-si/strings.xml
  83. Auto-merging core/res/res/values-sk/strings.xml
  84. Auto-merging core/res/res/values-sl/strings.xml
  85. Auto-merging core/res/res/values-sq/strings.xml
  86. Auto-merging core/res/res/values-sr/strings.xml
  87. Auto-merging core/res/res/values-sv/strings.xml
  88. Auto-merging core/res/res/values-sw/strings.xml
  89. Auto-merging core/res/res/values-ta/strings.xml
  90. Auto-merging core/res/res/values-te/strings.xml
  91. Auto-merging core/res/res/values-th/strings.xml
  92. Auto-merging core/res/res/values-tl/strings.xml
  93. Auto-merging core/res/res/values-tr/strings.xml
  94. Auto-merging core/res/res/values-uk/strings.xml
  95. Auto-merging core/res/res/values-ur/strings.xml
  96. Auto-merging core/res/res/values-uz/strings.xml
  97. Auto-merging core/res/res/values-vi/strings.xml
  98. Auto-merging core/res/res/values-zh-rCN/strings.xml
  99. Auto-merging core/res/res/values-zh-rHK/strings.xml
  100. Auto-merging core/res/res/values-zh-rTW/strings.xml
  101. Auto-merging core/res/res/values-zu/strings.xml
  102. Auto-merging core/res/res/values/strings.xml
  103. Auto-merging core/res/res/values/symbols.xml
  104. Auto-merging packages/CompanionDeviceManager/src/com/android/companiondevicemanager/DeviceChooserActivity.java
  105. Auto-merging packages/SettingsProvider/src/android/provider/settings/validators/SystemSettingsValidators.java
  106. Auto-merging packages/Shell/AndroidManifest.xml
  107. Auto-merging packages/SystemUI/AndroidManifest.xml
  108. Auto-merging packages/SystemUI/res-keyguard/values-af/strings.xml
  109. Auto-merging packages/SystemUI/res-keyguard/values-am/strings.xml
  110. Auto-merging packages/SystemUI/res-keyguard/values-ar/strings.xml
  111. Auto-merging packages/SystemUI/res-keyguard/values-as/strings.xml
  112. Auto-merging packages/SystemUI/res-keyguard/values-az/strings.xml
  113. Auto-merging packages/SystemUI/res-keyguard/values-b+sr+Latn/strings.xml
  114. Auto-merging packages/SystemUI/res-keyguard/values-be/strings.xml
  115. Auto-merging packages/SystemUI/res-keyguard/values-bg/strings.xml
  116. Auto-merging packages/SystemUI/res-keyguard/values-bn/strings.xml
  117. Auto-merging packages/SystemUI/res-keyguard/values-bs/strings.xml
  118. Auto-merging packages/SystemUI/res-keyguard/values-ca/strings.xml
  119. Auto-merging packages/SystemUI/res-keyguard/values-cs/strings.xml
  120. Auto-merging packages/SystemUI/res-keyguard/values-da/strings.xml
  121. Auto-merging packages/SystemUI/res-keyguard/values-de/strings.xml
  122. Auto-merging packages/SystemUI/res-keyguard/values-el/strings.xml
  123. Auto-merging packages/SystemUI/res-keyguard/values-en-rAU/strings.xml
  124. Auto-merging packages/SystemUI/res-keyguard/values-en-rCA/strings.xml
  125. Auto-merging packages/SystemUI/res-keyguard/values-en-rGB/strings.xml
  126. Auto-merging packages/SystemUI/res-keyguard/values-en-rIN/strings.xml
  127. Auto-merging packages/SystemUI/res-keyguard/values-en-rXC/strings.xml
  128. Auto-merging packages/SystemUI/res-keyguard/values-es-rUS/strings.xml
  129. Auto-merging packages/SystemUI/res-keyguard/values-es/strings.xml
  130. Auto-merging packages/SystemUI/res-keyguard/values-et/strings.xml
  131. Auto-merging packages/SystemUI/res-keyguard/values-eu/strings.xml
  132. Auto-merging packages/SystemUI/res-keyguard/values-fa/strings.xml
  133. Auto-merging packages/SystemUI/res-keyguard/values-fi/strings.xml
  134. Auto-merging packages/SystemUI/res-keyguard/values-fr-rCA/strings.xml
  135. Auto-merging packages/SystemUI/res-keyguard/values-fr/strings.xml
  136. Auto-merging packages/SystemUI/res-keyguard/values-gl/strings.xml
  137. Auto-merging packages/SystemUI/res-keyguard/values-gu/strings.xml
  138. Auto-merging packages/SystemUI/res-keyguard/values-hi/strings.xml
  139. Auto-merging packages/SystemUI/res-keyguard/values-hr/strings.xml
  140. Auto-merging packages/SystemUI/res-keyguard/values-hu/strings.xml
  141. Auto-merging packages/SystemUI/res-keyguard/values-hy/strings.xml
  142. Auto-merging packages/SystemUI/res-keyguard/values-in/strings.xml
  143. Auto-merging packages/SystemUI/res-keyguard/values-is/strings.xml
  144. Auto-merging packages/SystemUI/res-keyguard/values-it/strings.xml
  145. Auto-merging packages/SystemUI/res-keyguard/values-iw/strings.xml
  146. Auto-merging packages/SystemUI/res-keyguard/values-ja/strings.xml
  147. Auto-merging packages/SystemUI/res-keyguard/values-ka/strings.xml
  148. Auto-merging packages/SystemUI/res-keyguard/values-kk/strings.xml
  149. Auto-merging packages/SystemUI/res-keyguard/values-km/strings.xml
  150. Auto-merging packages/SystemUI/res-keyguard/values-kn/strings.xml
  151. Auto-merging packages/SystemUI/res-keyguard/values-ko/strings.xml
  152. Auto-merging packages/SystemUI/res-keyguard/values-ky/strings.xml
  153. Auto-merging packages/SystemUI/res-keyguard/values-lo/strings.xml
  154. Auto-merging packages/SystemUI/res-keyguard/values-lt/strings.xml
  155. Auto-merging packages/SystemUI/res-keyguard/values-lv/strings.xml
  156. Auto-merging packages/SystemUI/res-keyguard/values-mk/strings.xml
  157. Auto-merging packages/SystemUI/res-keyguard/values-ml/strings.xml
  158. Auto-merging packages/SystemUI/res-keyguard/values-mn/strings.xml
  159. Auto-merging packages/SystemUI/res-keyguard/values-mr/strings.xml
  160. Auto-merging packages/SystemUI/res-keyguard/values-ms/strings.xml
  161. Auto-merging packages/SystemUI/res-keyguard/values-my/strings.xml
  162. Auto-merging packages/SystemUI/res-keyguard/values-nb/strings.xml
  163. Auto-merging packages/SystemUI/res-keyguard/values-ne/strings.xml
  164. Auto-merging packages/SystemUI/res-keyguard/values-nl/strings.xml
  165. Auto-merging packages/SystemUI/res-keyguard/values-or/strings.xml
  166. Auto-merging packages/SystemUI/res-keyguard/values-pa/strings.xml
  167. Auto-merging packages/SystemUI/res-keyguard/values-pl/strings.xml
  168. Auto-merging packages/SystemUI/res-keyguard/values-pt-rBR/strings.xml
  169. Auto-merging packages/SystemUI/res-keyguard/values-pt-rPT/strings.xml
  170. Auto-merging packages/SystemUI/res-keyguard/values-pt/strings.xml
  171. Auto-merging packages/SystemUI/res-keyguard/values-ro/strings.xml
  172. Auto-merging packages/SystemUI/res-keyguard/values-ru/strings.xml
  173. Auto-merging packages/SystemUI/res-keyguard/values-si/strings.xml
  174. Auto-merging packages/SystemUI/res-keyguard/values-sk/strings.xml
  175. Auto-merging packages/SystemUI/res-keyguard/values-sl/strings.xml
  176. Auto-merging packages/SystemUI/res-keyguard/values-sq/strings.xml
  177. Auto-merging packages/SystemUI/res-keyguard/values-sr/strings.xml
  178. Auto-merging packages/SystemUI/res-keyguard/values-sv/strings.xml
  179. Auto-merging packages/SystemUI/res-keyguard/values-sw/strings.xml
  180. Auto-merging packages/SystemUI/res-keyguard/values-ta/strings.xml
  181. Auto-merging packages/SystemUI/res-keyguard/values-te/strings.xml
  182. Auto-merging packages/SystemUI/res-keyguard/values-th/strings.xml
  183. Auto-merging packages/SystemUI/res-keyguard/values-tl/strings.xml
  184. Auto-merging packages/SystemUI/res-keyguard/values-tr/strings.xml
  185. Auto-merging packages/SystemUI/res-keyguard/values-uk/strings.xml
  186. Auto-merging packages/SystemUI/res-keyguard/values-ur/strings.xml
  187. Auto-merging packages/SystemUI/res-keyguard/values-uz/strings.xml
  188. Auto-merging packages/SystemUI/res-keyguard/values-vi/strings.xml
  189. Auto-merging packages/SystemUI/res-keyguard/values-zh-rCN/strings.xml
  190. Auto-merging packages/SystemUI/res-keyguard/values-zh-rHK/strings.xml
  191. Auto-merging packages/SystemUI/res-keyguard/values-zh-rTW/strings.xml
  192. Auto-merging packages/SystemUI/res-keyguard/values-zu/strings.xml
  193. Auto-merging packages/SystemUI/res-keyguard/values/strings.xml
  194. Auto-merging packages/SystemUI/shared/src/com/android/systemui/shared/plugins/PluginManagerImpl.java
  195. Auto-merging packages/SystemUI/src/com/android/keyguard/KeyguardAbsKeyInputView.java
  196. Auto-merging packages/SystemUI/src/com/android/keyguard/KeyguardPINView.java
  197. Auto-merging packages/SystemUI/src/com/android/keyguard/KeyguardPasswordView.java
  198. Auto-merging packages/SystemUI/src/com/android/keyguard/KeyguardPatternView.java
  199. Auto-merging packages/SystemUI/src/com/android/keyguard/KeyguardPinBasedInputView.java
  200. Auto-merging packages/SystemUI/src/com/android/keyguard/KeyguardSecurityContainer.java
  201. Auto-merging packages/SystemUI/src/com/android/keyguard/KeyguardSimPukView.java
  202. Auto-merging packages/SystemUI/src/com/android/systemui/SlicePermissionActivity.java
  203. Auto-merging packages/SystemUI/src/com/android/systemui/bubbles/BubbleExpandedView.java
  204. Auto-merging packages/SystemUI/src/com/android/systemui/controls/controller/ControlsProviderLifecycleManager.kt
  205. Auto-merging packages/SystemUI/src/com/android/systemui/controls/ui/ControlActionCoordinatorImpl.kt
  206. Auto-merging packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java
  207. Auto-merging packages/SystemUI/src/com/android/systemui/pip/PipTaskOrganizer.java
  208. Auto-merging packages/SystemUI/src/com/android/systemui/screenshot/SaveImageInBackgroundTask.java
  209. Auto-merging packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationSectionsManager.kt
  210. Auto-merging packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayout.java
  211. Auto-merging packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java
  212. Auto-merging packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayoutTest.java
  213. Auto-merging packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/StatusBarTest.java
  214. Auto-merging services/companion/java/com/android/server/companion/CompanionDeviceManagerService.java
  215. Auto-merging services/core/java/android/os/UserManagerInternal.java
  216. Auto-merging services/core/java/com/android/server/AlarmManagerService.java
  217. Auto-merging services/core/java/com/android/server/ConnectivityService.java
  218. Auto-merging services/core/java/com/android/server/StorageManagerService.java
  219. Auto-merging services/core/java/com/android/server/TelephonyRegistry.java
  220. Auto-merging services/core/java/com/android/server/accounts/AccountManagerService.java
  221. Auto-merging services/core/java/com/android/server/am/ActiveServices.java
  222. Auto-merging services/core/java/com/android/server/am/ActivityManagerConstants.java
  223. Auto-merging services/core/java/com/android/server/am/ActivityManagerService.java
  224. Auto-merging services/core/java/com/android/server/am/ServiceRecord.java
  225. Auto-merging services/core/java/com/android/server/biometrics/Utils.java
  226. Auto-merging services/core/java/com/android/server/connectivity/Vpn.java
  227. Auto-merging services/core/java/com/android/server/display/DisplayManagerService.java
  228. Auto-merging services/core/java/com/android/server/inputmethod/InputMethodManagerService.java
  229. Auto-merging services/core/java/com/android/server/locksettings/LockSettingsService.java
  230. Auto-merging services/core/java/com/android/server/net/NetworkPolicyManagerService.java
  231. Auto-merging services/core/java/com/android/server/notification/NotificationManagerService.java
  232. Auto-merging services/core/java/com/android/server/notification/PreferencesHelper.java
  233. Auto-merging services/core/java/com/android/server/notification/SnoozeHelper.java
  234. Auto-merging services/core/java/com/android/server/pm/CrossProfileAppsServiceImpl.java
  235. Auto-merging services/core/java/com/android/server/pm/PackageInstallerService.java
  236. Auto-merging services/core/java/com/android/server/pm/PackageInstallerSession.java
  237. Auto-merging services/core/java/com/android/server/pm/PackageManagerService.java
  238. Auto-merging services/core/java/com/android/server/pm/UserManagerService.java
  239. Auto-merging services/core/java/com/android/server/pm/permission/BasePermission.java
  240. Auto-merging services/core/java/com/android/server/pm/permission/PermissionManagerService.java
  241. Auto-merging services/core/java/com/android/server/policy/PhoneWindowManager.java
  242. Auto-merging services/core/java/com/android/server/slice/SliceManagerService.java
  243. Auto-merging services/core/java/com/android/server/storage/StorageUserConnection.java
  244. Auto-merging services/core/java/com/android/server/uri/UriGrantsManagerService.java
  245. Auto-merging services/core/java/com/android/server/wm/ActivityRecord.java
  246. Auto-merging services/core/java/com/android/server/wm/ActivityStack.java
  247. Auto-merging services/core/java/com/android/server/wm/DisplayContent.java
  248. Auto-merging services/core/java/com/android/server/wm/EnsureActivitiesVisibleHelper.java
  249. Auto-merging services/core/java/com/android/server/wm/InputMonitor.java
  250. Auto-merging services/core/java/com/android/server/wm/LockTaskController.java
  251. Auto-merging services/core/java/com/android/server/wm/RootWindowContainer.java
  252. Auto-merging services/core/java/com/android/server/wm/Task.java
  253. Auto-merging services/core/java/com/android/server/wm/WindowManagerService.java
  254. Auto-merging services/core/java/com/android/server/wm/WindowState.java
  255. Auto-merging services/core/jni/com_android_server_power_PowerManagerService.cpp
  256. Auto-merging services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
  257. Auto-merging services/tests/servicestests/src/com/android/server/locksettings/SyntheticPasswordTests.java
  258. Auto-merging services/tests/servicestests/src/com/android/server/uri/UriGrantsManagerServiceTest.java
  259. Auto-merging services/tests/uiservicestests/src/com/android/server/notification/BuzzBeepBlinkTest.java
  260. Auto-merging services/tests/uiservicestests/src/com/android/server/notification/NotificationManagerServiceTest.java
  261. Auto-merging services/tests/uiservicestests/src/com/android/server/notification/PreferencesHelperTest.java
  262. Auto-merging services/tests/uiservicestests/src/com/android/server/notification/SnoozeHelperTest.java
  263. Auto-merging services/tests/wmtests/src/com/android/server/wm/DisplayContentTests.java
  264. Auto-merging services/tests/wmtests/src/com/android/server/wm/LockTaskControllerTest.java
  265. Auto-merging services/tests/wmtests/src/com/android/server/wm/TaskRecordTests.java
  266. Auto-merging services/usage/java/com/android/server/usage/UsageStatsService.java
  267. Auto-merging services/voiceinteraction/java/com/android/server/voiceinteraction/VoiceInteractionManagerService.java
  268. Auto-merging telecomm/java/android/telecom/TelecomManager.java
  269. Auto-merging telephony/java/android/telephony/SubscriptionInfo.java
  270. Merge made by the 'ort' strategy.
  271.  core/java/android/app/AutomaticZenRule.java        |  79 +++++-
  272.  core/java/android/app/INotificationManager.aidl    |   2 +-
  273.  core/java/android/app/NotificationManager.java     |   8 +-
  274.  .../android/app/admin/DevicePolicyManager.java     |  22 ++
  275.  .../app/admin/DevicePolicyManagerInternal.java     |   8 +
  276.  .../android/app/admin/IDevicePolicyManager.aidl    |   3 +
  277.  core/java/android/app/slice/SliceProvider.java     |   5 -
  278.  .../content/AbstractThreadedSyncAdapter.java       |  20 ++
  279.  .../content/pm/IPackageInstallerSession.aidl       |   1 +
  280.  core/java/android/content/pm/PackageInstaller.java |  12 +
  281.  .../content/pm/parsing/ParsingPackageUtils.java    |   8 +
  282.  .../parsing/component/ParsedPermissionUtils.java   |  48 ++++
  283.  core/java/android/debug/AdbManager.java            |   3 +
  284.  .../GeofenceHardwareRequestParcelable.java         |   9 +-
  285.  core/java/android/os/Parcel.java                   |   1 +
  286.  .../service/gatekeeper/GateKeeperResponse.java     |   2 +-
  287.  .../service/notification/ZenModeConfig.java        |  15 +-
  288.  .../service/voice/AlwaysOnHotwordDetector.java     |  57 +++-
  289.  .../service/voice/VoiceInteractionService.java     |   2 +-
  290.  .../view/inputmethod/InputMethodManager.java       |   2 +-
  291.  .../internal/app/HarmfulAppWarningActivity.java    |   4 +
  292.  .../com/android/internal/infra/AndroidFuture.java  | 116 ++++++---
  293.  .../android/internal/infra/ServiceConnector.java   |  28 +-
  294.  ...ficationAccessConfirmationActivityContract.java |  10 +-
  295.  .../internal/policy/IKeyguardStateCallback.aidl    |   2 +-
  296.  .../android/internal/util/ScreenshotHelper.java    |   4 +-
  297.  .../android/internal/view/IInputMethodManager.aidl |   2 +-
  298.  core/res/AndroidManifest.xml                       |   5 +
  299.  core/res/res/values-pl/strings.xml                 |   4 +-
  300.  core/res/res/values-te/strings.xml                 |   4 +-
  301.  .../src/android/app/AutomaticZenRuleTest.java      | 153 +++++++++++
  302.  .../DeviceChooserActivity.java                     |   2 -
  303.  packages/SystemUI/AndroidManifest.xml              |   2 +-
  304.  .../SystemUI/res-keyguard/values-ar/strings.xml    |   2 +-
  305.  .../SystemUI/res-keyguard/values-km/strings.xml    |   2 +-
  306.  .../SystemUI/res-keyguard/values-uz/strings.xml    |   6 +-
  307.  .../systemui/shared/plugins/PluginManagerImpl.java |   1 -
  308.  .../AdminSecondaryLockScreenController.java        |   3 +-
  309.  .../android/keyguard/KeyguardAbsKeyInputView.java  |   4 +-
  310.  .../src/com/android/keyguard/KeyguardHostView.java |  11 +-
  311.  .../src/com/android/keyguard/KeyguardPINView.java  |   6 +
  312.  .../com/android/keyguard/KeyguardPasswordView.java |   6 +
  313.  .../com/android/keyguard/KeyguardPatternView.java  |   3 +-
  314.  .../android/keyguard/KeyguardSecurityCallback.java |   9 +-
  315.  .../keyguard/KeyguardSecurityContainer.java        |  34 ++-
  316.  .../com/android/keyguard/KeyguardSimPinView.java   |   9 +-
  317.  .../com/android/keyguard/KeyguardSimPukView.java   |  13 +-
  318.  .../android/systemui/SlicePermissionActivity.java  |   7 +-
  319.  .../controller/ControlsProviderLifecycleManager.kt |   6 +
  320.  .../controls/ui/ControlActionCoordinatorImpl.kt    |  13 +-
  321.  .../android/systemui/controls/ui/DetailDialog.kt   |  32 ++-
  322.  .../systemui/keyguard/KeyguardViewMediator.java    |  16 +-
  323.  .../statusbar/StatusBarStateControllerImpl.java    |   4 +-
  324.  .../statusbar/SysuiStatusBarStateController.java   |  14 +-
  325.  .../NotificationInterruptStateProviderImpl.java    |  91 ++++++-
  326.  .../systemui/statusbar/phone/StatusBar.java        |  13 +-
  327.  .../AdminSecondaryLockScreenControllerTest.java    |   3 +-
  328.  .../ControlsProviderLifecycleManagerTest.kt        |  50 +++-
  329.  .../systemui/controls/ui/DetailDialogTest.kt       |  74 ++++++
  330.  ...NotificationInterruptStateProviderImplTest.java | 112 ++++++++
  331.  .../systemui/statusbar/phone/StatusBarTest.java    |   6 +-
  332.  .../companion/CompanionDeviceManagerService.java   |  13 +-
  333.  .../android/content/pm/PackageManagerInternal.java |   6 +
  334.  .../core/java/android/os/UserManagerInternal.java  |   8 +
  335.  .../com/android/server/AlarmManagerService.java    |   7 +-
  336.  .../com/android/server/StorageManagerService.java  |  15 ++
  337.  .../server/accounts/AccountManagerService.java     |  17 ++
  338.  .../android/server/adb/AdbDebuggingManager.java    |  21 +-
  339.  .../java/com/android/server/adb/AdbService.java    |   2 +-
  340.  .../java/com/android/server/am/ActiveServices.java |  36 ++-
  341.  .../java/com/android/server/biometrics/Utils.java  |  61 +----
  342.  .../android/server/connectivity/PacManager.java    |  19 +-
  343.  .../java/com/android/server/connectivity/Vpn.java  |  10 +
  344.  .../inputmethod/InputMethodManagerService.java     |  69 +++--
  345.  .../MultiClientInputMethodManagerService.java      |   2 +-
  346.  .../notification/NotificationManagerService.java   | 192 ++++++++++++--
  347.  .../server/notification/PreferencesHelper.java     |   3 +
  348.  .../android/server/notification/SnoozeHelper.java  |  11 +
  349.  .../android/server/notification/ZenModeHelper.java |  58 +++--
  350.  .../server/pm/CrossProfileAppsServiceImpl.java     |   6 +-
  351.  .../android/server/pm/PackageInstallerService.java |  62 ++++-
  352.  .../android/server/pm/PackageInstallerSession.java |  19 +-
  353.  .../android/server/pm/PackageManagerService.java   |  27 +-
  354.  .../com/android/server/pm/UserDataPreparer.java    |  11 +
  355.  .../com/android/server/pm/UserManagerService.java  |  42 +++
  356.  .../server/pm/permission/BasePermission.java       |   2 +
  357.  .../pm/permission/PermissionManagerService.java    |  35 ++-
  358.  .../policy/keyguard/KeyguardServiceWrapper.java    |   6 +
  359.  .../policy/keyguard/KeyguardStateMonitor.java      |   8 +-
  360.  .../android/server/slice/SliceManagerService.java  |   2 +
  361.  .../server/storage/StorageUserConnection.java      |  76 ++++--
  362.  .../java/com/android/server/wm/ActivityStack.java  |  18 +-
  363.  .../server/wm/EnsureActivitiesVisibleHelper.java   |   2 +-
  364.  .../android/server/wm/LaunchParamsPersister.java   |   3 +
  365.  .../com/android/server/wm/RootWindowContainer.java |   8 +-
  366.  services/core/java/com/android/server/wm/Task.java |  74 ++++--
  367.  .../android/server/wm/WindowManagerService.java    |  25 +-
  368.  .../java/com/android/server/wm/WindowState.java    |  18 +-
  369.  .../devicepolicy/BaseIDevicePolicyManager.java     |   7 +
  370.  .../devicepolicy/DevicePolicyManagerService.java   |  43 +++
  371.  .../server/accounts/AccountManagerServiceTest.java |  22 ++
  372.  .../server/adb/AdbDebuggingManagerTest.java        | 110 ++++++++
  373.  services/tests/uiservicestests/AndroidManifest.xml |   1 +
  374.  .../android/server/notification/ArchiveTest.java   |  40 ++-
  375.  .../server/notification/BuzzBeepBlinkTest.java     |  15 ++
  376.  .../notification/NotificationListenersTest.java    | 133 ++++++++++
  377.  .../NotificationManagerServiceTest.java            | 288 +++++++++++++++++++--
  378.  .../server/notification/PreferencesHelperTest.java |  15 +-
  379.  .../server/notification/SnoozeHelperTest.java      |  17 ++
  380.  .../server/notification/ZenModeConfigTest.java     |  55 +++-
  381.  .../server/notification/ZenModeHelperTest.java     | 113 +++++++-
  382.  .../src/com/android/server/wm/TaskRecordTests.java |  44 ++++
  383.  .../android/server/usage/UsageStatsService.java    |  26 +-
  384.  .../server/usage/UserUsageStatsService.java        |  10 +-
  385.  .../VoiceInteractionManagerService.java            |  23 ++
  386.  telecomm/java/android/telecom/TelecomManager.java  |  18 +-
  387.  .../android/internal/telecom/ITelecomService.aidl  |  13 +-
  388.  117 files changed, 2697 insertions(+), 483 deletions(-)
  389.  create mode 100644 core/tests/coretests/src/android/app/AutomaticZenRuleTest.java
  390.  create mode 100644 packages/SystemUI/tests/src/com/android/systemui/controls/ui/DetailDialogTest.kt
  391.  create mode 100644 services/tests/uiservicestests/src/com/android/server/notification/NotificationListenersTest.java
  392.  

Editor

You can edit this paste and save as new:


File Description
  • space
  • Paste Code
  • 01 Dec-2022
  • 25.37 Kb
You can Share it: