Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
799,574 Commits 3 Branches 0 Tags
cf4855204fa5b5f5467446a09cdcd47733cdbb98
Commit Graph

799574 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Lais Andrade
cf4855204f [automerger skipped] Merge "Remove VibrationEffect javadocs to methods not available in public APIs." into tm-dev am: 40739d5379 am: 6c9ae0c881 am: 864d640e8d -s ours 
am skip reason: Merged-In Idf5a339a5fb0ffd510e7fda0e3784916c8505eae with SHA-1 55217bc20b is already in history

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

Change-Id: I8ac25d4d548fbc3db39fb3f8afa24c2d0f890d62
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-16 16:40:32 +00:00
Lais Andrade
864d640e8d Merge "Remove VibrationEffect javadocs to methods not available in public APIs." into tm-dev am: 40739d5379 am: 6c9ae0c881 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19927366

Change-Id: Ic1f5ba8452dd775377d3e60400f274cc8747f9d7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-16 15:33:10 +00:00
Hawkwood Glazier
c6b0ab5a5f Merge "[DO NOT MERGE] Resolve file inconsistencies between master and tm-qpr-dev" into tm-qpr-dev am: 60e003dd44 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19933558

Change-Id: Ibf1b4301fbf68c75ff2379881e511e68d4e56e66
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-16 15:05:56 +00:00
Hawkwood Glazier
4942e374bb [DO NOT MERGE] Resolve file inconsistencies between master and tm-qpr-dev am: 3140d3530c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19933558

Change-Id: I3ddccb23cdb1ca1da9aef1743673e8cb1734f749
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-16 15:05:19 +00:00
Lucas Silva
b1aef7daff Merge "Implement double shadow text view for dream complications" into tm-qpr-dev am: 7b4c3efca3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19970191

Change-Id: I506de7382a5006d5f0488d70d686b98dcac7ef93
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-16 15:04:04 +00:00
Hawkwood Glazier
60e003dd44 Merge "[DO NOT MERGE] Resolve file inconsistencies between master and tm-qpr-dev" into tm-qpr-dev 2022-09-16 15:00:01 +00:00
Lucas Silva
7b4c3efca3 Merge "Implement double shadow text view for dream complications" into tm-qpr-dev 2022-09-16 14:56:10 +00:00
Lais Andrade
6c9ae0c881 Merge "Remove VibrationEffect javadocs to methods not available in public APIs." into tm-dev am: 40739d5379 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19927366

Change-Id: I6746d47216297650f05dbda218070e391efa8476
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-16 14:52:46 +00:00
Tiger Huang
d95c3121b6 Merge changes Ibc2f40dd,I37fb8ffc into tm-qpr-dev am: dea70726f6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19963144

Change-Id: I56d9cf4a11f38a8a574b7d5ab6c82ff770b7bdf1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-16 14:50:00 +00:00
Tiger Huang
dea70726f6 Merge changes Ibc2f40dd,I37fb8ffc into tm-qpr-dev 
* changes:
  Don't perform config change if relayoutAsync
  Apply synced relayout if we have FLAG_WINDOW_VISIBILITY_CHANGED
 2022-09-16 14:23:42 +00:00
Caitlin Shkuratov
dfa40d2c34 Merge "[SB Refactor] Delete ConnectivityInfoProcessor." into tm-qpr-dev am: 511de5c9af 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19970205

Change-Id: I1a0a09537998723d6307ca1201ccb021bbfbb10d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-16 14:12:45 +00:00
Caitlin Shkuratov
7eb41a4aab Merge "[Bluetooth] Convert BluetoothController logs to log buffer so we'll always have them." into tm-qpr-dev am: 33c9d7b2d2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19969290

Change-Id: If70964d872663ecd340cdb4db332eee524051cad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-16 14:11:46 +00:00
Automerger Merge Worker
a3cb49b285 Merge "Merge "Disable freeze insets for non blast sync shell transition" into tm-qpr-dev am: d9e5e14cb8" into tm-qpr-dev-plus-aosp 2022-09-16 14:11:21 +00:00
Treehugger Robot
913f632490 Merge "Enable DISALLOW_DUPLICATE_FIELD_IN_SKELETON since U" am: 643e586072 am: de4ea8f38b am: e47e8ec3f6 am: 15390ccf1d 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2216581

Change-Id: Ie48596f56518a60f82e5c00c1df82e2d6f1e8df0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-16 14:11:03 +00:00
Riddle Hsu
0411c0600c Merge "Disable freeze insets for non blast sync shell transition" into tm-qpr-dev am: d9e5e14cb8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19953145

Change-Id: I2f852cb28cb58f7a2907bdc60db9731a3da4ef65
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-16 14:10:53 +00:00
Mateusz Cicheński
678bb88d0e Merge "Mark touchable region of IME windows as unrestricted keep clear areas" into tm-qpr-dev am: 88f8b673d3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19971746

Change-Id: I9ffbfe2f63a46dae0d5d8db8a67ebe358bca917a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-16 14:09:33 +00:00
Caitlin Shkuratov
511de5c9af Merge "[SB Refactor] Delete ConnectivityInfoProcessor." into tm-qpr-dev 2022-09-16 14:06:42 +00:00
Caitlin Shkuratov
33c9d7b2d2 Merge "[Bluetooth] Convert BluetoothController logs to log buffer so we'll always have them." into tm-qpr-dev 2022-09-16 14:06:14 +00:00
Riddle Hsu
d9e5e14cb8 Merge "Disable freeze insets for non blast sync shell transition" into tm-qpr-dev 2022-09-16 14:02:29 +00:00
Lais Andrade
40739d5379 Merge "Remove VibrationEffect javadocs to methods not available in public APIs." into tm-dev 2022-09-16 14:01:19 +00:00
Treehugger Robot
dd2eed7053 Merge "Clarify method names and improve debug" am: 1ab7ac7f56 am: 1d74b8207b am: a6a8219798 am: f1f8a7519c 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2217306

Change-Id: I0139bcffa3e11a90e36e228d371f478ae851d5c9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-16 13:58:32 +00:00
Mateusz Cicheński
88f8b673d3 Merge "Mark touchable region of IME windows as unrestricted keep clear areas" into tm-qpr-dev 2022-09-16 13:40:55 +00:00
Treehugger Robot
15390ccf1d Merge "Enable DISALLOW_DUPLICATE_FIELD_IN_SKELETON since U" am: 643e586072 am: de4ea8f38b am: e47e8ec3f6 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2216581

Change-Id: Ie4bdd8bc8c8ecd9d1d6bda75326191ae158be7e6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-16 13:31:33 +00:00
Treehugger Robot
f1f8a7519c Merge "Clarify method names and improve debug" am: 1ab7ac7f56 am: 1d74b8207b am: a6a8219798 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2217306

Change-Id: If9182dd9cf8c31229b1cf2048111204a9b6411a2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-16 13:30:56 +00:00
Beverly Tai
79012b04a4 Merge "Wakeup display on taps before entering true AoD" into tm-qpr-dev am: 88deb41710 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19969291

Change-Id: Ic1292b3d54747918e1b9c8745c1bb03d64a7d1ff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-16 13:14:00 +00:00
Treehugger Robot
e47e8ec3f6 Merge "Enable DISALLOW_DUPLICATE_FIELD_IN_SKELETON since U" am: 643e586072 am: de4ea8f38b 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2216581

Change-Id: Ie07ed9d392491e6f5b76f6865b571b5593d00d17
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-16 12:48:29 +00:00
Treehugger Robot
a6a8219798 Merge "Clarify method names and improve debug" am: 1ab7ac7f56 am: 1d74b8207b 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2217306

Change-Id: I922d2d8012d82ce7dfa8a1c70e2582b60e98761e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-16 12:47:39 +00:00
Beverly Tai
88deb41710 Merge "Wakeup display on taps before entering true AoD" into tm-qpr-dev 2022-09-16 12:41:51 +00:00
Treehugger Robot
3f4b7c90e5 Merge "Switch to source build of JavaPoet." am: af086389ff am: 287790cc9c am: a09f7b22a3 am: c26ef968e1 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2216685

Change-Id: Iedb6926d0fee3f4425c0e7b5a7d9d94aa8470900
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-16 12:17:48 +00:00
Treehugger Robot
de4ea8f38b Merge "Enable DISALLOW_DUPLICATE_FIELD_IN_SKELETON since U" am: 643e586072 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2216581

Change-Id: I685a06987da1a3e4cd3c61934b8e5cc30c4a69a2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-16 12:16:44 +00:00
Treehugger Robot
1d74b8207b Merge "Clarify method names and improve debug" am: 1ab7ac7f56 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2217306

Change-Id: I5abc46e42fb8504e9ec1068c4f41f9a7979a76b8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-16 12:16:00 +00:00
Mårten Kongstad
0ba21f9c25 Merge "OMS: dump: silently ignore -a" am: 51f47d9bc1 am: 8dc97ba452 am: be5174e5f1 am: 6b33264e14 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2214727

Change-Id: I9ea1d9c2ff92c2bf4d370da5510a5ec5855329be
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-16 12:02:07 +00:00
Treehugger Robot
643e586072 Merge "Enable DISALLOW_DUPLICATE_FIELD_IN_SKELETON since U" 2022-09-16 11:54:08 +00:00
Treehugger Robot
1ab7ac7f56 Merge "Clarify method names and improve debug" 2022-09-16 11:44:50 +00:00
Treehugger Robot
c26ef968e1 Merge "Switch to source build of JavaPoet." am: af086389ff am: 287790cc9c am: a09f7b22a3 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2216685

Change-Id: Icabb5f114f621078cf0d3f4332c012badc73be71
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-16 11:24:30 +00:00
Mårten Kongstad
6b33264e14 Merge "OMS: dump: silently ignore -a" am: 51f47d9bc1 am: 8dc97ba452 am: be5174e5f1 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2214727

Change-Id: Ifb6282bf21b06557a47c816097f93d724cde8219
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-16 11:23:16 +00:00
Treehugger Robot
a09f7b22a3 Merge "Switch to source build of JavaPoet." am: af086389ff am: 287790cc9c 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2216685

Change-Id: I5bc251c9bd301d900fa3b81edb1c2a79b6631889
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-16 10:55:42 +00:00
Mårten Kongstad
be5174e5f1 Merge "OMS: dump: silently ignore -a" am: 51f47d9bc1 am: 8dc97ba452 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2214727

Change-Id: Ibbdc6e846af50d83bd7184cf146c371a13ef051e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-16 10:55:12 +00:00
Tetiana Meronyk
53dd479bb5 Merge "Align User Switcher with User Settings" into tm-qpr-dev am: 5e14ffaec6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19929708

Change-Id: I09b61e3c075c977140b844cbae2efcecfc01c808
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-16 10:51:37 +00:00
Tetiana Meronyk
5e14ffaec6 Merge "Align User Switcher with User Settings" into tm-qpr-dev 2022-09-16 10:30:42 +00:00
Treehugger Robot
287790cc9c Merge "Switch to source build of JavaPoet." am: af086389ff 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2216685

Change-Id: Ibc861f7876112231b8e213cf9568174230fcd6eb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-16 10:27:14 +00:00
Mårten Kongstad
8dc97ba452 Merge "OMS: dump: silently ignore -a" am: 51f47d9bc1 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2214727

Change-Id: I78f5a9e931239543e996c422ee1ee9b6c26656ba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-16 10:25:58 +00:00
Treehugger Robot
af086389ff Merge "Switch to source build of JavaPoet." 2022-09-16 09:56:48 +00:00
Neil Fuller
d272f786c2 Clarify method names and improve debug 
Change LocationTime.getTime() -> getUnixEpochMillis() for clarity.
Add LocationTime.toString() to improve log messages involving
LocationTime.

Test: build only
Bug: 236611620
Change-Id: I6f33bec6288c67e18a2008a735e88a8981186183
 2022-09-16 09:03:00 +00:00
Linus Tufvesson
7232ac610b Merge "Hide SAWs while LogAccessDialogActivity is visbile" into tm-qpr-dev am: ff37e2d652 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19854364

Change-Id: Id5f154b61d93d87ab0ab1b48164afe1c02e7c780
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-16 08:39:17 +00:00
Benno Lin
1d45f10c70 Merge "Create test app to emulate assistant UI." into tm-qpr-dev am: 4e330bd3fc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19928112

Change-Id: I531ec78cc1df6a5bacd205afc48f39f2f1d26048
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-16 08:37:01 +00:00
Mårten Kongstad
51f47d9bc1 Merge "OMS: dump: silently ignore -a" 2022-09-16 08:25:21 +00:00
Linus Tufvesson
ff37e2d652 Merge "Hide SAWs while LogAccessDialogActivity is visbile" into tm-qpr-dev 2022-09-16 08:01:16 +00:00
Benno Lin
4e330bd3fc Merge "Create test app to emulate assistant UI." into tm-qpr-dev 2022-09-16 07:52:02 +00:00
Mårten Kongstad
695bf3ca78 OMS: dump: silently ignore -a 
dumpsys will pass -a to each service. Teach the overlay manager to
silently ignore the argument.

Test: adb shell dumpsys | grep --text -A1 -e 'DUMP OF SERVICE overlay:' # no "Unknown argument: -a"
Change-Id: I00a786a8a3cd5996bfac95e05782b2f204f005c5
 2022-09-16 06:09:36 +00:00