Commit Graph

673711 Commits

Author SHA1 Message Date
Quang Luong
090d3dfd8a [automerger skipped] Merge "Fix NPE on getTitle()" into rvc-dev am: b1bf7f55c0 am: 25d1e643ec -s ours am: f289bf2d8b -s ours am: 620ec21de0 -s ours am: 22c4a43eba -s ours
am skip reason: Merged-In I35bf6f5911dc0ee56e43af7faddaceb479362863 with SHA-1 c006ad915a is already in history

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

Change-Id: Idca911521b59d3672388280a8bfb44c0c0fe99ed
2021-09-30 16:18:39 +00:00
Quang Luong
ce8aeb115c [automerger skipped] Merge "Fix NPE on getTitle()" into rvc-dev am: b1bf7f55c0 -s ours am: af87c9c134 -s ours am: 4c7f7c1567 -s ours am: 2848061a31 -s ours am: 2f5b9f555f -s ours
am skip reason: Merged-In I35bf6f5911dc0ee56e43af7faddaceb479362863 with SHA-1 af6f9ab235 is already in history

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

Change-Id: Id5f1bd67281fc80cac6889a56221ebd56fd7e150
2021-09-30 16:18:14 +00:00
Quang Luong
22c4a43eba [automerger skipped] Merge "Fix NPE on getTitle()" into rvc-dev am: b1bf7f55c0 am: 25d1e643ec -s ours am: f289bf2d8b -s ours am: 620ec21de0 -s ours
am skip reason: Merged-In I35bf6f5911dc0ee56e43af7faddaceb479362863 with SHA-1 c006ad915a is already in history

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

Change-Id: Ic93b575b99d04c270cf90a0611f8df19906c47e0
2021-09-30 16:07:23 +00:00
Quang Luong
2f5b9f555f [automerger skipped] Merge "Fix NPE on getTitle()" into rvc-dev am: b1bf7f55c0 -s ours am: af87c9c134 -s ours am: 4c7f7c1567 -s ours am: 2848061a31 -s ours
am skip reason: Merged-In I35bf6f5911dc0ee56e43af7faddaceb479362863 with SHA-1 af6f9ab235 is already in history

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

Change-Id: I6e49d4897fb95ea4a8ba9515672cf857124a6380
2021-09-30 16:07:03 +00:00
Quang Luong
620ec21de0 [automerger skipped] Merge "Fix NPE on getTitle()" into rvc-dev am: b1bf7f55c0 am: 25d1e643ec -s ours am: f289bf2d8b -s ours
am skip reason: Merged-In I35bf6f5911dc0ee56e43af7faddaceb479362863 with SHA-1 c006ad915a is already in history

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

Change-Id: I08da1e21f4b3f2bb48036683df3c612189bda79b
2021-09-30 15:53:36 +00:00
Quang Luong
2848061a31 [automerger skipped] Merge "Fix NPE on getTitle()" into rvc-dev am: b1bf7f55c0 -s ours am: af87c9c134 -s ours am: 4c7f7c1567 -s ours
am skip reason: Merged-In I35bf6f5911dc0ee56e43af7faddaceb479362863 with SHA-1 af6f9ab235 is already in history

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

Change-Id: I457315720d28fc237a7d2c03ef8ff933dbb1ce67
2021-09-30 15:53:30 +00:00
Quang Luong
f289bf2d8b [automerger skipped] Merge "Fix NPE on getTitle()" into rvc-dev am: b1bf7f55c0 am: 25d1e643ec -s ours
am skip reason: Merged-In I35bf6f5911dc0ee56e43af7faddaceb479362863 with SHA-1 c006ad915a is already in history

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

Change-Id: Ic7dbb441716e0cbbb6f7b34034c951d018e3d765
2021-09-30 15:42:04 +00:00
Quang Luong
4c7f7c1567 [automerger skipped] Merge "Fix NPE on getTitle()" into rvc-dev am: b1bf7f55c0 -s ours am: af87c9c134 -s ours
am skip reason: Merged-In I35bf6f5911dc0ee56e43af7faddaceb479362863 with SHA-1 af6f9ab235 is already in history

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

Change-Id: I7d122510fe91a2327cb58594ceba91675b23c12b
2021-09-30 15:40:11 +00:00
Quang Luong
25d1e643ec Merge "Fix NPE on getTitle()" into rvc-dev am: b1bf7f55c0
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15888884

Change-Id: I24fa6527a0b5727f5c1830d528dc86e27abf3c8b
2021-09-30 15:24:27 +00:00
Quang Luong
af87c9c134 [automerger skipped] Merge "Fix NPE on getTitle()" into rvc-dev am: b1bf7f55c0 -s ours
am skip reason: Merged-In I35bf6f5911dc0ee56e43af7faddaceb479362863 with SHA-1 af6f9ab235 is already in history

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

Change-Id: Iae2b535426d7ccd5b9f494d233931fa9da3b2b80
2021-09-30 15:24:16 +00:00
Quang Luong
b1bf7f55c0 Merge "Fix NPE on getTitle()" into rvc-dev 2021-09-30 15:12:59 +00:00
TreeHugger Robot
0d486f70e8 Merge "Support an x-coordinate for fps location" into sc-v2-dev am: 710a025d69
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15942750

Change-Id: Id6896f663a01455882982b73f289ff9c09b761b7
2021-09-30 15:04:14 +00:00
TreeHugger Robot
710a025d69 Merge "Support an x-coordinate for fps location" into sc-v2-dev 2021-09-30 14:49:25 +00:00
Beverly
2982e3a094 Support an x-coordinate for fps location
Test: manual, use AuthRipple adb commands
Bug: 197637248
Change-Id: I3943a65c91702b2c8ca532110ddc5ad05b239195
2021-09-30 09:04:21 -04:00
Bernardo Rufino
4da29a66be Merge "Log.wtf in mismatch + tests" am: 1cdbc7cbd1 am: d60218eb45 am: 5d32036b41 am: 18e5be7b98
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1837194

Change-Id: I97dd9ffe70d442d587759dbdd8fbdc2acc9a029e
2021-09-30 11:17:28 +00:00
Bernardo Rufino
18e5be7b98 Merge "Log.wtf in mismatch + tests" am: 1cdbc7cbd1 am: d60218eb45 am: 5d32036b41
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1837194

Change-Id: If1fa51158bfa1dd5fa901d907aea72a6c8379ddc
2021-09-30 11:04:34 +00:00
Bernardo Rufino
5d32036b41 Merge "Log.wtf in mismatch + tests" am: 1cdbc7cbd1 am: d60218eb45
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1837194

Change-Id: I59760a55f32106ca40678c460b6c583f7f118af9
2021-09-30 10:51:42 +00:00
TreeHugger Robot
ba16e6ed9d [automerger skipped] Merge "RESTRICT AUTOMERGE: Fix snapshot starting window stuck if the task never gain focus" into sc-dev am: 854b04130b am: 04ccacac3f -s ours am: 039e8a7baf -s ours
am skip reason: subject contains skip directive

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

Change-Id: Idf938d2a0fad7a72fd9dfce4ee9c6dbaa04452ac
2021-09-30 10:42:04 +00:00
Ming-Shin Lu
f39a3e493f [automerger skipped] RESTRICT AUTOMERGE: Fix snapshot starting window stuck if the task never gain focus am: a4f760bee7 am: 849894b3a7 -s ours am: bab30272df -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ib3eadef5c63e8c3bbd192ee1041a74609e0b2954
2021-09-30 10:41:53 +00:00
TreeHugger Robot
4a1e52afb5 [automerger skipped] Merge "RESTRICT AUTOMERGE: Fix snapshot starting window stuck if the task never gain focus" into sc-dev am: 854b04130b am: 04ccacac3f -s ours am: 8506e53035 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I980036ebd2265cb11504fa04bd59c13eac14c6f2
2021-09-30 10:41:34 +00:00
Ming-Shin Lu
16f2d92d4b [automerger skipped] RESTRICT AUTOMERGE: Fix snapshot starting window stuck if the task never gain focus am: a4f760bee7 am: 849894b3a7 -s ours am: 4ab280cc42 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I4a0aa81193cb55d155c1e8656d7f5036769d4e11
2021-09-30 10:41:32 +00:00
TreeHugger Robot
e031979488 [automerger skipped] Merge "RESTRICT AUTOMERGE: Fix snapshot starting window stuck if the task never gain focus" into sc-dev am: 854b04130b am: 8d46bdb823 am: 4fb125f713 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I7356886cdbc09a333bbc9a2e2759ed55d01dc9e2
2021-09-30 10:41:23 +00:00
Ming-Shin Lu
ac3c682a0c [automerger skipped] RESTRICT AUTOMERGE: Fix snapshot starting window stuck if the task never gain focus am: a4f760bee7 am: 72ea33eb75 am: f38f1ebb7d -s ours
am skip reason: subject contains skip directive

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

Change-Id: I9742f35a483bc7466100b54b06fe898bf98f7cf7
2021-09-30 10:41:19 +00:00
Bernardo Rufino
d60218eb45 Merge "Log.wtf in mismatch + tests" am: 1cdbc7cbd1
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1837194

Change-Id: I185410ce82ca057b6767d5ca0ff0368f046a1dff
2021-09-30 10:31:03 +00:00
TreeHugger Robot
8506e53035 [automerger skipped] Merge "RESTRICT AUTOMERGE: Fix snapshot starting window stuck if the task never gain focus" into sc-dev am: 854b04130b am: 04ccacac3f -s ours
am skip reason: Merged-In Ieb5a5e781f5da4228cfc493031b4ad17f2d31a77 with SHA-1 a4f760bee7 is already in history

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

Change-Id: I439e4022bc31ba5129eab9cc96c33e05901ade4f
2021-09-30 10:26:14 +00:00
TreeHugger Robot
039e8a7baf [automerger skipped] Merge "RESTRICT AUTOMERGE: Fix snapshot starting window stuck if the task never gain focus" into sc-dev am: 854b04130b am: 04ccacac3f -s ours
am skip reason: subject contains skip directive

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

Change-Id: I5a0ca11132167f2ba1a0ad57268740ac96849cbf
2021-09-30 10:26:07 +00:00
Ming-Shin Lu
4ab280cc42 [automerger skipped] RESTRICT AUTOMERGE: Fix snapshot starting window stuck if the task never gain focus am: a4f760bee7 am: 849894b3a7 -s ours
am skip reason: Merged-In Ieb5a5e781f5da4228cfc493031b4ad17f2d31a77 with SHA-1 a4f760bee7 is already in history

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

Change-Id: If0c2513c790f1502795b65b43ab8bdce85fdce3e
2021-09-30 10:26:07 +00:00
Ming-Shin Lu
bab30272df [automerger skipped] RESTRICT AUTOMERGE: Fix snapshot starting window stuck if the task never gain focus am: a4f760bee7 am: 849894b3a7 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I4e78b32622305847813d271a0b74ecc1be99a9d6
2021-09-30 10:26:05 +00:00
TreeHugger Robot
4fb125f713 Merge "RESTRICT AUTOMERGE: Fix snapshot starting window stuck if the task never gain focus" into sc-dev am: 854b04130b am: 8d46bdb823
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15937022

Change-Id: I48bd17f5270423f68cedfeb4ca481edbf6a7d969
2021-09-30 10:25:57 +00:00
Ming-Shin Lu
f38f1ebb7d RESTRICT AUTOMERGE: Fix snapshot starting window stuck if the task never gain focus am: a4f760bee7 am: 72ea33eb75
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15937022

Change-Id: Ib76cbe68741833fe597a828f167e715043814627
2021-09-30 10:25:54 +00:00
Bernardo Rufino
1cdbc7cbd1 Merge "Log.wtf in mismatch + tests" 2021-09-30 10:17:45 +00:00
TreeHugger Robot
04ccacac3f Merge "RESTRICT AUTOMERGE: Fix snapshot starting window stuck if the task never gain focus" into sc-dev am: 854b04130b
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15937022

Change-Id: Ied0985ebf5f66d7332e0ef0dd46c7212b4a29a99
2021-09-30 10:15:29 +00:00
Ming-Shin Lu
849894b3a7 RESTRICT AUTOMERGE: Fix snapshot starting window stuck if the task never gain focus am: a4f760bee7
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15937022

Change-Id: I67c974b959f0a5695384bba8ecfa144fde2e101e
2021-09-30 10:15:28 +00:00
TreeHugger Robot
8d46bdb823 Merge "RESTRICT AUTOMERGE: Fix snapshot starting window stuck if the task never gain focus" into sc-dev am: 854b04130b
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15937022

Change-Id: Idb42a396b305e30a66ba4dce875f48a6121b2787
2021-09-30 10:14:53 +00:00
Ming-Shin Lu
72ea33eb75 RESTRICT AUTOMERGE: Fix snapshot starting window stuck if the task never gain focus am: a4f760bee7
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15937022

Change-Id: I92e206162b407c1cf014bad5878ed5093693cd72
2021-09-30 10:14:29 +00:00
TreeHugger Robot
854b04130b Merge "RESTRICT AUTOMERGE: Fix snapshot starting window stuck if the task never gain focus" into sc-dev 2021-09-30 10:01:53 +00:00
Riya Ghai
0c0130cc5d Merge "Enable reading app-specific configuration." into sc-v2-dev am: 87e09cb81b
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15777629

Change-Id: I15e52d765940799fe415edb6226ac90e6aef60b6
2021-09-30 09:21:37 +00:00
Riya Ghai
87e09cb81b Merge "Enable reading app-specific configuration." into sc-v2-dev 2021-09-30 09:11:19 +00:00
Louis Chang
a3e60d2552 Merge "Sends TaskFragment info before scheduling activity launch" into sc-v2-dev am: 2496d18f31
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15897576

Change-Id: I8852bb8755d7cd0cec9ba7c4f8f03c7b010ddd1b
2021-09-30 07:26:29 +00:00
Louis Chang
2496d18f31 Merge "Sends TaskFragment info before scheduling activity launch" into sc-v2-dev 2021-09-30 07:13:13 +00:00
TreeHugger Robot
67a94e94af Merge "Applying lifecycle effect when changing TaskFragment bounds" into sc-v2-dev am: 7da918123f
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15938351

Change-Id: Ic57012779928b708a935b4ac163ea7e7cdc0fb6d
2021-09-30 06:30:14 +00:00
TreeHugger Robot
7da918123f Merge "Applying lifecycle effect when changing TaskFragment bounds" into sc-v2-dev 2021-09-30 06:13:49 +00:00
“riyaghai”
cf1276a3b5 Enable reading app-specific configuration.
Test: atest WmTests:ActivityTaskManagerServiceTests

Bug: 194370665

Change-Id: I2317d17af36709750f72e0f5859a427ebc38fa81
2021-09-30 06:03:42 +00:00
TreeHugger Robot
310962725c [automerger skipped] Merge "Fix NPE on getTitle()" into rvc-qpr-dev am: f25ee59fe9 -s ours am: 1d814e9bef -s ours am: 7f787b6b35 -s ours am: a673ef56d0 -s ours
am skip reason: Merged-In I35bf6f5911dc0ee56e43af7faddaceb479362863 with SHA-1 f00f2203b5 is already in history

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

Change-Id: I4f5d0dd16ef20f41aca2b6f7b02b16502cb861ba
2021-09-30 05:07:41 +00:00
TreeHugger Robot
9dd3cca1c7 [automerger skipped] Merge "Fix NPE on getTitle()" into rvc-qpr-dev am: f25ee59fe9 -s ours am: 1d814e9bef -s ours am: 7f787b6b35 -s ours am: 5c3c912a96 -s ours
am skip reason: Merged-In I35bf6f5911dc0ee56e43af7faddaceb479362863 with SHA-1 f00f2203b5 is already in history

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

Change-Id: I8afea26d204d5c6f3fe99dbfe88e3e4c285d1a12
2021-09-30 05:06:25 +00:00
TreeHugger Robot
b38384d6fc [automerger skipped] Merge "Remove frameworks/base/apex/appsearch and associated tests" into stage-aosp-master am: 8efe26afd6 am: f26b06a489 am: 8d0620b80f -s ours
am skip reason: Merged-In I38469ad5df100e90aba81bbdc82078b568301f09 with SHA-1 0b488bfdb2 is already in history

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

Change-Id: I41813725dc15d5e847150d06f40c56fe514e3a9d
2021-09-30 05:06:08 +00:00
TreeHugger Robot
0b46a74d5e [automerger skipped] Merge "Fix NPE on getTitle()" into rvc-qpr-dev am: f25ee59fe9 -s ours am: 1d814e9bef -s ours am: 49884992b8 -s ours am: dfe2ac3645 -s ours
am skip reason: Merged-In I35bf6f5911dc0ee56e43af7faddaceb479362863 with SHA-1 f00f2203b5 is already in history

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

Change-Id: Iebb249502a65d64bc4ce1ab9ec8c4349b877834f
2021-09-30 05:05:58 +00:00
TreeHugger Robot
5c3c912a96 [automerger skipped] Merge "Fix NPE on getTitle()" into rvc-qpr-dev am: f25ee59fe9 -s ours am: 1d814e9bef -s ours am: 7f787b6b35 -s ours
am skip reason: Merged-In I35bf6f5911dc0ee56e43af7faddaceb479362863 with SHA-1 f00f2203b5 is already in history

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

Change-Id: I6c0cacb2d18a289df79aa02b9f79bb1efe1d1130
2021-09-30 04:49:35 +00:00
TreeHugger Robot
a673ef56d0 [automerger skipped] Merge "Fix NPE on getTitle()" into rvc-qpr-dev am: f25ee59fe9 -s ours am: 1d814e9bef -s ours am: 7f787b6b35 -s ours
am skip reason: Merged-In I35bf6f5911dc0ee56e43af7faddaceb479362863 with SHA-1 f00f2203b5 is already in history

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

Change-Id: I8351c516a981f39a6e3d103e281cabe224e3f77c
2021-09-30 04:49:34 +00:00
TreeHugger Robot
8d0620b80f Merge "Remove frameworks/base/apex/appsearch and associated tests" into stage-aosp-master am: 8efe26afd6 am: f26b06a489
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15941404

Change-Id: I0bedde68a50948dc07e76c3de8ab115bd1e06561
2021-09-30 04:49:29 +00:00