Jeff Chang
64458eaa1f
Merge "Start activity with focus root task for staged split" into sc-dev
2021-04-29 10:35:31 +00:00
TreeHugger Robot
00ea5427b6
Merge "Fix pass null TranslationCapability to dispatchRequestTranslation()" into sc-dev
2021-04-29 10:29:56 +00:00
Kholoud Mohamed
d462813702
[automerger skipped] Merge "Add a new permission to install testOnly apps" am: 71d89f5d0d am: bc7a72187d am: d4f1cb46f3 -s ours
...
am skip reason: Merged-In I047a4013fb3462db3487eab2d1635ea75ae29264 with SHA-1 dead379e48 is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1689746
Change-Id: Ib090f41ce6141b3885066aab6f89c1bd0174a543
2021-04-29 10:27:54 +00:00
Treehugger Robot
fe69da2d49
[automerger skipped] Merge "Add getters to NetworkStateSnapshot" am: 2f83b6a72d am: 289a438f06 am: bbf4c3c2ce -s ours
...
am skip reason: Merged-In Id1707753b42ae88d2b95e4bd00a792609434e4f5 with SHA-1 d78c60c10a is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1684649
Change-Id: Ice81dc86428db24ce535ad052e5b594e18d401b8
2021-04-29 10:26:50 +00:00
Lucy Chang
83cb5cca94
Merge "Adds install source checks for accessibility service" into sc-dev
2021-04-29 10:17:05 +00:00
Kholoud Mohamed
d4f1cb46f3
Merge "Add a new permission to install testOnly apps" am: 71d89f5d0d am: bc7a72187d
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1689746
Change-Id: Iddb8ddbd27e4a21dbd34420501797c190480d45a
2021-04-29 10:03:44 +00:00
Treehugger Robot
bbf4c3c2ce
Merge "Add getters to NetworkStateSnapshot" am: 2f83b6a72d am: 289a438f06
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1684649
Change-Id: Ia6047f77624d6be82dc2528f52f7c77bf5b29c17
2021-04-29 10:02:43 +00:00
Kholoud Mohamed
bc7a72187d
Merge "Add a new permission to install testOnly apps" am: 71d89f5d0d
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1689746
Change-Id: I337626f46f9e44322c537ad2243dc0185f45b83e
2021-04-29 09:43:10 +00:00
Treehugger Robot
289a438f06
Merge "Add getters to NetworkStateSnapshot" am: 2f83b6a72d
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1684649
Change-Id: I3263514a5d75141c81e5f9d7389603ed369e95df
2021-04-29 09:39:19 +00:00
Kholoud Mohamed
71d89f5d0d
Merge "Add a new permission to install testOnly apps"
2021-04-29 09:35:22 +00:00
Bowgo Tsai
d5b4a59bc0
Merge "Revert "[SettingsProvider] Remove @Readable for NFC_PAYMENT_DEFA..."" into sc-dev
2021-04-29 09:29:50 +00:00
Treehugger Robot
16897d63f2
[automerger skipped] Merge "Add getters to UnderlyingNetworkInfo" am: e2e8b9ce88 am: b2551d4cc9 am: 2d96bac3aa -s ours
...
am skip reason: Merged-In Id59744097208d91298a25ef110ade91a9cf291a1 with SHA-1 f6008978c4 is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1684651
Change-Id: I9ac1f63c16debb8269b240380257bffd934021d1
2021-04-29 09:23:49 +00:00
Treehugger Robot
2f83b6a72d
Merge "Add getters to NetworkStateSnapshot"
2021-04-29 09:20:34 +00:00
Michał Brzeziński
4380046455
Merge "Removing unnecessary QuickSettings clip bounds in split shade" into sc-dev
2021-04-29 09:14:41 +00:00
Martijn Coenen
166400b045
Merge "Revert "Revert "Fixup app-private dirs that are not writable.""" into sc-dev
2021-04-29 09:02:45 +00:00
Treehugger Robot
2d96bac3aa
Merge "Add getters to UnderlyingNetworkInfo" am: e2e8b9ce88 am: b2551d4cc9
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1684651
Change-Id: I33d2bbca5a72ab8500a7886073c9f4c4d1b84925
2021-04-29 08:57:50 +00:00
Alina Zaidi
0a33298578
Merge "Change background color of work widgets, for when work profile is off." into sc-dev
2021-04-29 08:57:45 +00:00
TreeHugger Robot
51cac482f5
Merge "Update documentation for activity flags." into sc-dev
2021-04-29 08:48:15 +00:00
Treehugger Robot
b2551d4cc9
Merge "Add getters to UnderlyingNetworkInfo" am: e2e8b9ce88
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1684651
Change-Id: I97222bb04bdea78178741245016658cad7f082dc
2021-04-29 08:16:36 +00:00
Alex Johnston
412667ddaf
Merge "Disable security and network logging COPE" into sc-dev
2021-04-29 08:04:23 +00:00
Bowgo Tsai
42c0359ff4
Revert "[SettingsProvider] Remove @Readable for NFC_PAYMENT_DEFA..."
...
Revert "Add an exception for Settings.Secure.NFC_PAYMENT_DEFAULT..."
Revert submission 14326766-b/174151290
Reason for revert: potential test error for b/186717555
Reverted Changes:
I97fcd5550:[SettingsProvider] Remove @Readable for NFC_PAYMEN...
I6e55bef75:Add an exception for Settings.Secure.NFC_PAYMENT_D...
Bug: 186717555
Bug: 182283321
Bug: 174151290
Change-Id: Ib84c57b855ffe10870fda2568a7499746f0d2335
2021-04-29 07:44:33 +00:00
Treehugger Robot
e2e8b9ce88
Merge "Add getters to UnderlyingNetworkInfo"
2021-04-29 07:29:08 +00:00
SongFerng Wang
09ca8113f5
Merge "Add CAPABILITY_PHYSICAL_CHANNEL_CONFIG_1_6_SUPPORTED" into sc-dev
2021-04-29 07:15:25 +00:00
Joanne Chung
be4bdf0a11
Fix pass null TranslationCapability to dispatchRequestTranslation()
...
We only provide text-text capability now and when the UiTranslation
APIs are called, the model files should be ready. To simplify the call
flow, we hardcode the TranslationCapability now. If more capabilities
are supported, we will call the API to get the TranslationCapability.
Bug: 183589662
Test: atest CtsTranslationTestCases
Change-Id: Iea1baac7988402298b2577d03adf9d889f45ad53
2021-04-29 15:08:58 +08:00
Tianjie Xu
285e375408
Merge changes Ia43ab0ab,I0c4b91aa am: 474d549f7c am: 38762c75d1 am: af1f784ee0
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1690266
Change-Id: I0155ccab9da75bf5b5f34825a21003545219b512
2021-04-29 06:31:41 +00:00
Tianjie Xu
af1f784ee0
Merge changes Ia43ab0ab,I0c4b91aa am: 474d549f7c am: 38762c75d1
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1690266
Change-Id: I527307961df8d8e8932b704cb63c959b0f6f4ee8
2021-04-29 06:02:44 +00:00
lucychang
f1f2c84756
Adds install source checks for accessibility service
...
Adds install source checks for accessibility services. An
accessibility category service must be installed from the
given allow list or not from the default installer if no
allow list provided.
Bug: 182959209
Test: atest AccessibilitySecurityPolicyTest
Change-Id: I023c15b9ebd87785e2f7eb1e218bec4ad006e52f
2021-04-29 05:55:54 +00:00
Treehugger Robot
8215d0e109
[automerger skipped] Merge "Rename getAllNetworkStateSnapshot which should be pluralized" am: d1473b36d6 am: 4ed0a5060a am: 97a9cfb605 -s ours
...
am skip reason: Merged-In Ic18d17d05984fa2466c962c7843c0ef7183ce77c with SHA-1 402b1fd272 is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1684034
Change-Id: Ica9ed0e1d93f46da1d012e2e5a6c9ade0863a9fc
2021-04-29 05:45:59 +00:00
Benedict Wong
795d43d31d
Merge "Update set|getRetryIntervalsMs to Millis" am: c6fe30068d am: 058149884f am: 33d2807b02
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1688783
Change-Id: Ica36f177bcb4a1d6625a0bf14288f6acd3ea4224
2021-04-29 05:44:56 +00:00
Kyunglyul Hyun
b82f38cf3e
Merge "Clean up Session2Record in MCS" into sc-dev
2021-04-29 05:37:00 +00:00
Tianjie Xu
38762c75d1
Merge changes Ia43ab0ab,I0c4b91aa am: 474d549f7c
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1690266
Change-Id: Iaf1b2b66a8e396d7e0670ef6967347f6878c14ee
2021-04-29 05:35:46 +00:00
Treehugger Robot
97a9cfb605
Merge "Rename getAllNetworkStateSnapshot which should be pluralized" am: d1473b36d6 am: 4ed0a5060a
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1684034
Change-Id: I0fa34d7cddaede25898d262196804bdd327caf8e
2021-04-29 05:28:28 +00:00
Benedict Wong
33d2807b02
Merge "Update set|getRetryIntervalsMs to Millis" am: c6fe30068d am: 058149884f
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1688783
Change-Id: Ie3a9bf8043ce00fe838720c094b5b180af829910
2021-04-29 05:26:56 +00:00
Yi Kong
0ac12528fe
Merge "profcollect: alternative property to start profcollectd" am: 67bea71a2f am: f965ffe0e2 am: a9a873f0a9
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1689805
Change-Id: Ic38016ae401d7b1852e178d792da209ac7983f3a
2021-04-29 05:21:15 +00:00
Tianjie Xu
474d549f7c
Merge changes Ia43ab0ab,I0c4b91aa
...
* changes:
Always use the server based provider if HAL isn't installed
Dump the IOexception before retrying load escrow key
2021-04-29 05:17:55 +00:00
Treehugger Robot
4ed0a5060a
Merge "Rename getAllNetworkStateSnapshot which should be pluralized" am: d1473b36d6
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1684034
Change-Id: Ie83813d57b678de4f60fe8e70aa1aa42d74a0bc8
2021-04-29 05:07:31 +00:00
Benedict Wong
058149884f
Merge "Update set|getRetryIntervalsMs to Millis" am: c6fe30068d
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1688783
Change-Id: I0ddfd92b8d08c58b2318a5bbd2a8a4bb6edbc8f9
2021-04-29 05:01:27 +00:00
Yi Kong
a9a873f0a9
Merge "profcollect: alternative property to start profcollectd" am: 67bea71a2f am: f965ffe0e2
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1689805
Change-Id: I52018c828c4a8e6325df0d0845a8ced930ec9a0d
2021-04-29 05:01:11 +00:00
Cecilia Hong
5b0e5143b3
Merge "Skip showing the Smartspace recommendation card if it's an empty update." into sc-dev
2021-04-29 04:55:29 +00:00
TreeHugger Robot
2ac5334517
Merge "Add unit test init method." into sc-dev
2021-04-29 04:53:40 +00:00
Bill Lin
9df0e2bdb3
Merge "1/ Add ONE_HANDED_MODE_ACTIVATED secure settings for shortcut" into sc-dev
2021-04-29 04:49:42 +00:00
TreeHugger Robot
f38abb5943
Merge "Add traces in ViewRootImpl handler" into sc-dev
2021-04-29 04:49:10 +00:00
Treehugger Robot
d1473b36d6
Merge "Rename getAllNetworkStateSnapshot which should be pluralized"
2021-04-29 04:40:51 +00:00
Riddle Hsu
3d4a4d7510
Merge "Disable fixed rotation for starting window with ime surface" into sc-dev
2021-04-29 04:39:44 +00:00
Benedict Wong
c6fe30068d
Merge "Update set|getRetryIntervalsMs to Millis"
2021-04-29 04:35:45 +00:00
Svetoslav Ganov
e8b84a6e00
Merge "Remap per app id for AR/location sources" into sc-dev
2021-04-29 04:26:06 +00:00
Yi Kong
f965ffe0e2
Merge "profcollect: alternative property to start profcollectd" am: 67bea71a2f
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1689805
Change-Id: I514172bcc3d10a7e5b2ed6be8dec81eff6a6c299
2021-04-29 04:23:19 +00:00
Zhen Zhang
f7857d0b6d
Merge "Log user level App Hibernation related atoms" into sc-dev
2021-04-29 04:20:12 +00:00
Yi Kong
67bea71a2f
Merge "profcollect: alternative property to start profcollectd"
2021-04-29 04:02:10 +00:00
Treehugger Robot
0ff06379e8
Merge "[Telephony] Remove getChannelNumber from SDK" am: cadc1f6086 am: b5dfa219ba am: 7c32a3f599
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1687486
Change-Id: Idfd940eff40c0b485bee00603258555101d1309e
2021-04-29 03:38:40 +00:00