TreeHugger Robot
bb98628e59
Merge "[Telephony] Describe the failure case in doc" into sc-dev
2021-04-16 06:42:41 +00:00
Winson Chung
7b8d346fde
Merge "Workaround for sysui studio builds" into sc-dev
2021-04-16 05:47:52 +00:00
TreeHugger Robot
c9eaa3d80f
Merge "Rename IInputMethodManager#reportPerceptible" into sc-dev
2021-04-16 05:14:30 +00:00
Zoey Chen
a2fee1cbcb
[Telephony] Describe the failure case in doc
...
Bug: 167347923
Test: make
Change-Id: Ifd7f234b358ba400ee67500567cacd3da3916646
2021-04-16 04:20:35 +00:00
Les Lee
d055f6d844
Merge "wifi: Rename country change API" into sc-dev
2021-04-16 03:52:40 +00:00
Treehugger Robot
e7f2887e7d
[automerger skipped] Merge "[Telephoy] Add phone Id to support DSDS" am: 40fa3f58b2 am: 36fb168817 am: bf415409e8 -s ours
...
am skip reason: skip tag Change-Id I6bf2285e37366ca517a3ea16194a203371e44964 with SHA-1 1835f13c4e is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1676437
Change-Id: I5aec4568e35a02b0195837f9f88d1f4eda10b6c4
2021-04-16 03:28:00 +00:00
Chiachang Wang
6242135e1b
[automerger skipped] Merge "Remove hidden connectivity method usage" am: 82628265f6 am: cec2c552d1 am: 3aaf67546b -s ours
...
am skip reason: skip tag Change-Id I5e23bd0ab2e82fc3583c56162d5ac3fec6cfc359 with SHA-1 27691f8468 is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1674570
Change-Id: Id77f7514def20bc7171780a7bf4ad009c5821776
2021-04-16 03:27:40 +00:00
Hongwei Wang
8a9aed5159
Merge "Deprecate ActivityRecord#mLastKnownParent" into sc-dev
2021-04-16 03:24:54 +00:00
TreeHugger Robot
7863e20566
Merge "Add null check before trying to give appOps to package." into sc-dev
2021-04-16 03:19:10 +00:00
Treehugger Robot
bf415409e8
Merge "[Telephoy] Add phone Id to support DSDS" am: 40fa3f58b2 am: 36fb168817
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1676437
Change-Id: Ia0c72bde710182dbd9e5e99c3ad5f309147a0353
2021-04-16 03:03:44 +00:00
Chiachang Wang
3aaf67546b
Merge "Remove hidden connectivity method usage" am: 82628265f6 am: cec2c552d1
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1674570
Change-Id: Ief89028aaabb21be85063cb9ba1e59f84c59419c
2021-04-16 03:03:19 +00:00
Wilson Wu
40055cde56
Merge "Make IInputMethodPrivilegedOperations to async (2/N)" into sc-dev
2021-04-16 02:58:16 +00:00
Treehugger Robot
36fb168817
Merge "[Telephoy] Add phone Id to support DSDS" am: 40fa3f58b2
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1676437
Change-Id: I3af03da8a500872635396324731c9816df399165
2021-04-16 02:35:38 +00:00
Treehugger Robot
40fa3f58b2
Merge "[Telephoy] Add phone Id to support DSDS"
2021-04-16 02:28:45 +00:00
Chiachang Wang
cec2c552d1
Merge "Remove hidden connectivity method usage" am: 82628265f6
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1674570
Change-Id: I9bfa535f64717b36216c987c35025b52fe22c078
2021-04-16 02:25:09 +00:00
TreeHugger Robot
5600015ef0
Merge "Re-route to default display if the home activity doesn't support multi-display" into sc-dev
2021-04-16 02:04:09 +00:00
Chiachang Wang
82628265f6
Merge "Remove hidden connectivity method usage"
2021-04-16 01:44:39 +00:00
Wei Sheng Shih
fca79abeea
Merge "Only initialize Session's package name once." into sc-dev
2021-04-16 01:25:06 +00:00
Chiachang Wang
f083dae515
Merge "Extend framework-connectivity.impl visibility" into sc-dev
2021-04-16 01:13:34 +00:00
TreeHugger Robot
1332ae37bd
Merge "Change brightness icon depending on level" into sc-dev
2021-04-16 01:12:40 +00:00
TreeHugger Robot
4a9b2e6e36
Merge "@IntDef incorrectly marked as containing flags" into sc-dev
2021-04-16 01:06:49 +00:00
Wei Sheng Shih
5ddb3b7aeb
Merge "Hold WM lock when add starting window to TaskOrganizer" into sc-dev
2021-04-16 01:06:45 +00:00
TreeHugger Robot
bd3d2e9a7f
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev
2021-04-16 00:39:55 +00:00
TreeHugger Robot
43799d4d09
Merge "Allow provisioning state transition _PROFILE_FINALIZED->_USER_UNMANAGED" into sc-dev
2021-04-16 00:37:19 +00:00
Chiachang Wang
490befc506
Resovle hidden connectivity methods usage in SystemUITests
...
Connectivity hidden methods are no longer accessible outside
the module scope. Thus, replace the usage with equivalent
methods.
Bug: 182859030
Test: 1. remove framework-connectivity.impl from framework bp
2. cd frameworks/base/packages/SystemUI/tests ; mm
3. atest SystemUITests
Change-Id: Icfdcd983762eac788042e3d41db06597b69f3559
2021-04-16 00:34:53 +00:00
Chavi Weingarten
d6ea380f13
Merge "Use BLAST layer for screen rotation, surface freezer, and organizer" into sc-dev
2021-04-16 00:30:11 +00:00
Jason Chang
97bf5c62e1
Merge "Fix One Handed Feedback gesture's animations are quite jarring" into sc-dev
2021-04-16 00:29:30 +00:00
Amit Mahajan
fc8f430092
Add null check before trying to give appOps to package.
...
Test: none
Bug: 164209140
Change-Id: I64184e9d035be538684c42c85c869f09b048069f
2021-04-15 23:54:21 +00:00
Siim Sammul
ac6f5ee927
Merge "Add dplotnikov and gaillard as owners for binder proto file too." am: 0c67225999 am: d3404b3c64 am: 6cebda3718
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1675889
Change-Id: I2bba3c67462f4191f90181c6a16c17297c430bfc
2021-04-15 23:37:53 +00:00
Siim Sammul
6cebda3718
Merge "Add dplotnikov and gaillard as owners for binder proto file too." am: 0c67225999 am: d3404b3c64
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1675889
Change-Id: Ifb3927030a449e5f6daa7a34e673b955714de58b
2021-04-15 22:56:51 +00:00
Automerger Merge Worker
2363862360
Merge "[automerger skipped] Merge "OOB generateLocalOobData" am: 3a4f319145 am: bb6ea3457c am: 5a9fcc3d76 -s ours" into sc-dev
2021-04-15 22:48:25 +00:00
TreeHugger Robot
8d4b0ccbd8
Merge "Update gpay icon on keyguard visibility" into sc-dev
2021-04-15 22:48:17 +00:00
Treehugger Robot
07e439e1c1
[automerger skipped] Merge "OOB generateLocalOobData" am: 3a4f319145 am: bb6ea3457c am: 5a9fcc3d76 -s ours
...
am skip reason: skip tag Change-Id I2d4167a6c92ee0cc24da12df206838161c8f3318 with SHA-1 ba2c904f8d is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1677745
Change-Id: Ie353ad0084ce116285dfef430a5c4d29ad5e3e56
2021-04-15 22:48:15 +00:00
TreeHugger Robot
e438034aee
Merge "Phase 1 of status bar system event animations" into sc-dev
2021-04-15 22:46:11 +00:00
Bill Yi
77147a3194
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Idf84fd16696c813cc4edac45ffac2ea585b07746
2021-04-15 22:42:56 +00:00
Winson Chung
cbe99e87b7
Workaround for sysui studio builds
...
- SysUI studio builds seem to have problems referencing the private
attr directly, so just expose it as a color itself
Bug: 152086714
Test: Studio builds
Change-Id: I6256848ef7e608c7eb1773c83184219e8af47032
2021-04-15 15:35:31 -07:00
Siim Sammul
d3404b3c64
Merge "Add dplotnikov and gaillard as owners for binder proto file too." am: 0c67225999
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1675889
Change-Id: Ic704bca33a496656e6c58d8b67499c796d3349de
2021-04-15 22:32:04 +00:00
Treehugger Robot
5a9fcc3d76
Merge "OOB generateLocalOobData" am: 3a4f319145 am: bb6ea3457c
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1677745
Change-Id: Idcbf693aa6336aea76c0fa7d97262132c0cdeb8a
2021-04-15 22:19:43 +00:00
Chavi Weingarten
e6791edbbf
Merge "Update Wallpaper to use BLAST" into sc-dev
2021-04-15 22:05:37 +00:00
Siim Sammul
0c67225999
Merge "Add dplotnikov and gaillard as owners for binder proto file too."
2021-04-15 21:51:23 +00:00
Todd Kennedy
5889bd1f7f
@IntDef incorrectly marked as containing flags
...
Change-Id: I0bde93fde412b4770a84124a9e323e4ac003d587
Bug: 174238856
Fixes: 174238856
Test: None. Doc only change.
2021-04-15 21:51:13 +00:00
TreeHugger Robot
123079969d
Merge "Fix size calculation" into sc-dev
2021-04-15 21:37:59 +00:00
TreeHugger Robot
92716ec4ed
Merge "Do not hold indicators for apps that become paused" into sc-dev
2021-04-15 21:35:10 +00:00
Erik Wolsheimer
404920ea6b
Merge "Revert "Increase MAX_ATTRIBUTIONS to 10000"" into sc-dev
2021-04-15 21:20:25 +00:00
Beverly
b28ccdd2b4
Update gpay icon on keyguard visibility
...
- only show gpay icon on LS if cards exist
Test: manual
Fixes: 185490957
Change-Id: I53bf1633322406ae42f4eeb9153fbd903c01fd29
2021-04-15 21:19:59 +00:00
TreeHugger Robot
9863f6343b
Merge "Exempting prioritized alarms from min_window" into sc-dev
2021-04-15 21:06:12 +00:00
TreeHugger Robot
a9d0dfcd90
Merge "Clean up ComponentController and fix some bugs." into sc-dev
2021-04-15 21:01:42 +00:00
Zhen Zhang
69f97fa19a
Merge "Log hibernation state with AppStartOccurred atom" into sc-dev
2021-04-15 20:58:26 +00:00
TreeHugger Robot
541aa2ce6b
Merge "Add log detail on throttling events" into sc-dev
2021-04-15 20:58:22 +00:00
Treehugger Robot
bb6ea3457c
Merge "OOB generateLocalOobData" am: 3a4f319145
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1677745
Change-Id: I8317187de5b6a2d5d9ae4deb01509dd2e0fd4fef
2021-04-15 20:55:01 +00:00