Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
637,619 Commits 3 Branches 0 Tags
04fa25348270ea85c4eb859de5964ac00a2e323a
Commit Graph

637619 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sergey Volnov
04fa253482 Change attribution integration points for SpeechRecognizer. 
I've deleted the extra attribution for now just to fix the bug asap, but
we need a long-term sync to make sure attribution works properly. For
both cases when the RS app decides to integrate with the new attribution
framework OR decides to ignore it.

Bug: 184963112
Test: atest CtsVoiceRecognitionTestCases
Change-Id: I20bd8174c1a188da6c5af55cdd3bebee8a638d2d
 2021-04-23 16:16:39 +01:00
Neil Fuller
1b2c66567e Merge "Move tests to CTS" into sc-dev 2021-04-23 10:58:22 +00:00
Ricky Wai
81a9d50ccf Merge "Allow current active live wallpaper app to bypass app switching protection" into sc-dev 2021-04-23 10:45:21 +00:00
Kholoud Mohamed
3a7975ee33 Merge "Changed dpm shell commands to use 'cmd device_policy'" into sc-dev 2021-04-23 10:02:54 +00:00
Shan Huang
fd0acf04c5 Merge "Support setting charger port location via config." into sc-dev 2021-04-23 09:16:32 +00:00
Bill Lin
4add47c730 Merge changes I741b1915,Ida2f23da into sc-dev 
* changes:
  2/ Migrate isInOneHanded() in OneHandedState
  1/ Add OneHandedState to manage the transition flow
 2021-04-23 08:37:07 +00:00
Louis Chang
1637653a78 Merge "Try fixing the flakiness of TaplTestsQuickstep#testSwitchToOverview" into sc-dev 2021-04-23 08:34:36 +00:00
Treehugger Robot
ee8a15ba74 [automerger skipped] Merge "bpfmt native/android/Android.bp" am: b33f9df49c am: f91d043cfc am: 0a653daa3e -s ours 
am skip reason: skip tag Change-Id I444579e5672b3bc421f7e73f27bb0d12d92a9a03 with SHA-1 b16eb69e6d is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1684528

Change-Id: I8ef039408595fa8b28718c9f4e3691c2d95e2e85
 2021-04-23 07:59:27 +00:00
Winson Chung
d743386cc3 Merge "Update launch cookie when moving a task to front" into sc-dev 2021-04-23 07:37:37 +00:00
Treehugger Robot
0a653daa3e Merge "bpfmt native/android/Android.bp" am: b33f9df49c am: f91d043cfc 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1684528

Change-Id: I5657c340dc381858e5f2edddc6ee8c515e01b4b5
 2021-04-23 07:36:38 +00:00
Treehugger Robot
f91d043cfc Merge "bpfmt native/android/Android.bp" am: b33f9df49c 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1684528

Change-Id: Ieabf281255a870d5bb54df317f57ae8a148a70a4
 2021-04-23 07:16:36 +00:00
Remi NGUYEN VAN
f520ca6ea4 [automerger skipped] Merge "Use connectivity resources in service-connectivity" am: efcd27a0dc am: 10c557f3c6 am: de6d2772ed -s ours 
am skip reason: skip tag Change-Id I778d94a5aac0c4e20e78b1ba3a002495c17a38a0 with SHA-1 6211f92cc6 is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1646967

Change-Id: Iacd373f6c0e9296aa90d2cd366cd81868f37cfa7
 2021-04-23 06:57:14 +00:00
Remi NGUYEN VAN
c9fd0e57e2 Merge "Add AOSP certificates for connectivity resources" am: 410973d590 am: 1f2fdb0668 am: 3c436880d5 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1684645

Change-Id: Ia7809d391c86f2a9aa5ce43a5d3f4c145bf12e2c
 2021-04-23 06:56:38 +00:00
Treehugger Robot
b33f9df49c Merge "bpfmt native/android/Android.bp" 2021-04-23 06:48:09 +00:00
Remi NGUYEN VAN
de6d2772ed Merge "Use connectivity resources in service-connectivity" am: efcd27a0dc am: 10c557f3c6 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1646967

Change-Id: I919b54b5527fbe3f9609c6ae70a31a651e4fda90
 2021-04-23 06:36:06 +00:00
Remi NGUYEN VAN
3c436880d5 Merge "Add AOSP certificates for connectivity resources" am: 410973d590 am: 1f2fdb0668 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1684645

Change-Id: Ifa29b6c542a1b229d5fe32cf81c5189541af3f28
 2021-04-23 06:35:34 +00:00
TreeHugger Robot
32a48b01f0 Merge "Fix magnification bounds cut out with floating a11y button" into sc-dev 2021-04-23 06:14:21 +00:00
Remi NGUYEN VAN
10c557f3c6 Merge "Use connectivity resources in service-connectivity" am: efcd27a0dc 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1646967

Change-Id: I2169a7c0c8b5eb1073789ffc115cdec73fbe3ab8
 2021-04-23 06:10:14 +00:00
TreeHugger Robot
9efd8c3d35 Merge "Make PendingIntent mutable in UiModeManger" into sc-dev 2021-04-23 06:09:32 +00:00
TreeHugger Robot
74c93b7ba8 Merge "Camera: Update streamConfigurationMap doc for 1080p min JPEG size" into sc-dev 2021-04-23 06:09:14 +00:00
Remi NGUYEN VAN
1f2fdb0668 Merge "Add AOSP certificates for connectivity resources" am: 410973d590 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1684645

Change-Id: Ia8e130fe84aecefb29ee8eded1fa480517ac4ebf
 2021-04-23 06:05:36 +00:00
Shan Huang
677600f973 Support setting charger port location via config. 
Test: Manual
Bug: 182719493
Change-Id: I20baedc860b7cffa66a1f28fe678516e5efce52f
 2021-04-23 14:04:12 +08:00
Colin Cross
186a6edd47 bpfmt native/android/Android.bp 
Fix formatting errors in with bpfmt -w native/android/Android.bp.

Test: builds
Change-Id: I444579e5672b3bc421f7e73f27bb0d12d92a9a03
Merged-In: I444579e5672b3bc421f7e73f27bb0d12d92a9a03
 2021-04-23 05:50:40 +00:00
Remi NGUYEN VAN
efcd27a0dc Merge "Use connectivity resources in service-connectivity" 2021-04-23 05:42:13 +00:00
Remi NGUYEN VAN
410973d590 Merge "Add AOSP certificates for connectivity resources" 2021-04-23 05:40:58 +00:00
Hongwei Wang
b899f626b6 Merge "Apply PictureInPictureSurfaceTransaction upon reparent" into sc-dev 2021-04-23 05:17:12 +00:00
TreeHugger Robot
8af1716cc5 Merge "bpfmt native/android/Android.bp" into sc-dev 2021-04-23 04:51:12 +00:00
Christine Franks
8327ce6b24 Merge "Check virtual displays for ime dispatch" into sc-dev 2021-04-23 04:29:02 +00:00
TreeHugger Robot
29ebb3033c Merge "Camera: Add new hidden tag for multiResolutionStream support" into sc-dev 2021-04-23 04:14:36 +00:00
Tony Huang
faa060ae15 Merge "Make AppTransition animations sharable (3/n)" into sc-dev 2021-04-23 04:03:10 +00:00
TreeHugger Robot
60a6502567 Merge "Fix SurfaceView callback timings" into sc-dev 2021-04-23 03:47:30 +00:00
Lucas Dupin
d765a0634b Merge "Fix issue where theme would be accepted in SUW" into sc-dev 2021-04-23 03:17:06 +00:00
Jay Aliomer
3e67a9d2de Make PendingIntent mutable in UiModeManger 
Fixes: b/173744200
Test: UiModeManagerTest
Change-Id: I30a7e7d33fa432ca6352a80e41c4641ed6c6c1dc
 2021-04-22 22:56:49 -04:00
Bill Yi
f5da656426 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fff12f831d -s ours am: 6d90946e08 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14287128

Change-Id: I1b6f7f943635bd00ccf259ae3cea30ac338c16cb
 2021-04-23 02:41:56 +00:00
Xusong Wang
f89ad4b416 [automerger skipped] Merge changes from topic "rs-deprecation" am: 67485cf930 am: 9b5047f696 am: 33be8eec88 -s ours 
am skip reason: skip tag Change-Id I50b7ce18841eb38f2e5d986307afd91791efdf7b with SHA-1 efbe8ac645 is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1683499

Change-Id: I142fc8fb529cc2c0d656dac2d2d54c51545a1aa0
 2021-04-23 02:41:36 +00:00
Xusong Wang
592d5b54c6 [automerger skipped] Deprecate RS Java APIs. am: 1f8dc651a8 am: 06287994ec am: 2bf7341ecb -s ours 
am skip reason: skip tag Change-Id Id271a794679d445c480d62c87ae6c8150f6901f8 with SHA-1 8b4548c43a is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1683498

Change-Id: I8f8f21713b4d6b05bd93c2701c7f4d93e0ef5377
 2021-04-23 02:41:24 +00:00
TreeHugger Robot
7ebc50ac8c Merge "Disable flaky flicker tests" into sc-dev 2021-04-23 02:38:16 +00:00
Bill Yi
6d90946e08 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fff12f831d -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14287128

Change-Id: I66612ae59af080f0e958bda4b6b34db48fc76f2f
 2021-04-23 02:29:31 +00:00
Ming-Shin Lu
4255d36267 Merge "Update IME window status when KeyguardController#setKeyguardShown" into sc-dev 2021-04-23 02:22:43 +00:00
Xusong Wang
33be8eec88 Merge changes from topic "rs-deprecation" am: 67485cf930 am: 9b5047f696 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1683499

Change-Id: Ib4d54fc2149f9a1289975c71ba2465a4702185b2
 2021-04-23 02:13:22 +00:00
Xusong Wang
2bf7341ecb Deprecate RS Java APIs. am: 1f8dc651a8 am: 06287994ec 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1683498

Change-Id: I4cf34e687eb12b192740bab30197c37d10ce00e9
 2021-04-23 02:13:19 +00:00
TreeHugger Robot
fa29f6f85c Merge "Optimizing AppStandby.getIdleUidsForUser" into sc-dev 2021-04-23 02:00:08 +00:00
Arc Wang
fb4b580156 Merge "Fix UsageProgressBarPreference number pattern problem" into sc-dev 2021-04-23 01:57:30 +00:00
Xusong Wang
9b5047f696 Merge changes from topic "rs-deprecation" am: 67485cf930 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1683499

Change-Id: I800ecc51dfd2c9972f5ab23938df4eb6f2a4c3f0
 2021-04-23 01:46:12 +00:00
Xusong Wang
06287994ec Deprecate RS Java APIs. am: 1f8dc651a8 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1683498

Change-Id: I823539a725e083870cf734e45c254a97da982ee5
 2021-04-23 01:41:33 +00:00
Remi NGUYEN VAN
2ecc79d616 Use connectivity resources in service-connectivity 
Migrate resource usage to the connectivity resource package.
For framework resources that have known overlays, keep a fallback until
the overlays can be migrated.

Bug: 182125649
Test: atest FrameworksNetTests
Merged-In: I778d94a5aac0c4e20e78b1ba3a002495c17a38a0
(clean cherry-pick)

Change-Id: I778d94a5aac0c4e20e78b1ba3a002495c17a38a0
 2021-04-23 10:36:15 +09:00
Colin Cross
b16eb69e6d bpfmt native/android/Android.bp 
Fix formatting errors in with bpfmt -w native/android/Android.bp.

Bug: 170784825
Test: builds
Change-Id: I444579e5672b3bc421f7e73f27bb0d12d92a9a03
 2021-04-23 01:26:14 +00:00
Jing Ji
1528d2ebcb Merge "Move the callbacks in app died/crash handling out of WM global lock" into sc-dev 2021-04-23 01:20:51 +00:00
Xusong Wang
67485cf930 Merge changes from topic "rs-deprecation" 
* changes:
  Silence compiler errors because of renderscript deprecation.
  Deprecate RS Java APIs.
 2021-04-23 01:16:04 +00:00
Bill Yi
7d8314eac6 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d6db38186a -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14283572

Change-Id: I59c3f4bc70aa17927a3814a437bcd4d0784770ba
 2021-04-23 01:08:46 +00:00