Commit Graph

752306 Commits

Author SHA1 Message Date
Charles Chen
e90e1090bb Merge "Fix NPE in RunningTasks#getTasks" into tm-dev am: 6186949467
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17045438

Change-Id: I533ffe6621f3c57a65c158ad49f76f9a79583ba8
2022-03-03 02:45:34 +00:00
TreeHugger Robot
d96f7549de Merge "Placeholder change for cherry pick" into tm-dev am: 8a2da670b6
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17061856

Change-Id: I60baea8488bf31cf908ef29dc879efd05eeffc31
2022-03-03 02:44:29 +00:00
Charles Chen
6186949467 Merge "Fix NPE in RunningTasks#getTasks" into tm-dev 2022-03-03 02:43:08 +00:00
Julia Reynolds
a95c3a3ad3 [automerger skipped] Filter notification APIs by user am: 4d7ca1dbce -s ours am: e749344386 -s ours am: c6e84150fa -s ours am: 3837076d84 -s ours am: 5a1cf350e6 -s ours am: 178be83f51 -s ours am: d97b8a0aec -s ours am: 4ec15391c8 -s ours am: a15a829153 -s ours
am skip reason: skipped by user juliacr

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

Change-Id: Ib5ef48a530adff5d3b6894300dafb3aa20c9b3cc
2022-03-03 02:42:19 +00:00
TreeHugger Robot
8a2da670b6 Merge "Placeholder change for cherry pick" into tm-dev 2022-03-03 02:21:28 +00:00
Julia Reynolds
a15a829153 [automerger skipped] Filter notification APIs by user am: 4d7ca1dbce -s ours am: e749344386 -s ours am: c6e84150fa -s ours am: 3837076d84 -s ours am: 5a1cf350e6 -s ours am: 178be83f51 -s ours am: d97b8a0aec -s ours am: 4ec15391c8 -s ours
am skip reason: skipped by user juliacr

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

Change-Id: I611f7f1665e3e75d7a6be85419b0880f9d0449bc
2022-03-03 02:20:09 +00:00
Jack Yu
11f544ca7f Placeholder change for cherry pick
In order to CP ag/16070832, we need to place
a placeholder change here.

Test: None
Bug: 196597630
Change-Id: I3fe553c2717ae2feeec3cc821e647d9e2f70a83d
2022-03-02 18:16:38 -08:00
Wei Sheng Shih
b49e2b9cf1 Merge "Rename 'EMPTY' to 'SOLID_COLOR' for splash screen style." into tm-dev am: 7790c1b933 am: 35fef75f47
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16963767

Change-Id: I77dbadbedb9082693093a23eb8fc2242b579f252
2022-03-03 01:57:51 +00:00
Julia Reynolds
4ec15391c8 [automerger skipped] Filter notification APIs by user am: 4d7ca1dbce -s ours am: e749344386 -s ours am: c6e84150fa -s ours am: 3837076d84 -s ours am: 5a1cf350e6 -s ours am: 178be83f51 -s ours am: d97b8a0aec -s ours
am skip reason: skipped by user juliacr

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

Change-Id: I2ca0689feca01711e83dbfb87659172efd8885d9
2022-03-03 01:56:43 +00:00
Julia Reynolds
58531faa48 [automerger skipped] Filter notification APIs by user am: 4d7ca1dbce -s ours am: e749344386 -s ours am: c6e84150fa -s ours am: 3837076d84 -s ours am: 5a1cf350e6 -s ours am: e970e18130 -s ours am: d225baff76 -s ours am: 6bee91dd1a -s ours
am skip reason: skipped by user juliacr

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

Change-Id: I5ec2995ac22863822484752765cd73b360ab2496
2022-03-03 01:41:25 +00:00
Chiachang Wang
a233d5bb22 Merge "Rename getRequiresInternetValidation to isInternetValidationRequired" am: d734ce3202 am: 8344626eba am: 590305ed33 am: b8a6ed34bb am: 9b5374fae6
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1990334

Change-Id: I04ef7f0599eda824d4378a7ac6b228f365dd768d
2022-03-03 01:40:53 +00:00
Songchun Fan
d1b644e9f5 Merge "[pm] fix acquireAndRegisterNewAppId after app removal" into tm-dev am: 663a7ae5ce am: 7c090cd87b
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16992064

Change-Id: I604ae000470134caa409983234ee09ca1643e297
2022-03-03 01:40:02 +00:00
Jerry Chang
1266eb6695 Merge "Fix no touch events on half of the split screen" into tm-dev am: 16fc7aa4f5 am: 858e5c122f
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17053279

Change-Id: Ib34b22b92f3a883c7b5391e5382f540c2d6d8ff5
2022-03-03 01:39:01 +00:00
TreeHugger Robot
863cc4e40f Merge "Update the bubble overflow to match new visuals" into tm-dev am: c37e762e92 am: 5acc9e406d
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17015413

Change-Id: I9db3b6409e13a32d8e1eefd06c93017c626d922b
2022-03-03 01:38:14 +00:00
Rachel Lee
1e48f29f11 Merge "Cleanup Extended frame -> Vsync callback." into tm-dev am: acd10a9a97 am: 81e2769ff3
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17037018

Change-Id: Ib06dd900337c14a405b313e802cb414bc7a3b582
2022-03-03 01:37:34 +00:00
TreeHugger Robot
fc36e0d8f6 Merge "WebView: Revise setAlgorithmicDarkeningAllowed Javadoc" into tm-dev am: e7fffc65ad am: c0da75a97b
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17036545

Change-Id: I77c209285530b7c5259bbc56c9179621e9848bb5
2022-03-03 01:36:54 +00:00
Hai Zhang
88112d3672 Merge changes from topics "presubmit-am-4fce8d22f6ba4533875ba6f9fcf0183b", "presubmit-am-748689f93ea9431ca216195bbc7d9588" into tm-dev am: d0a198343b am: 77c6a68044
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17049382

Change-Id: I0b1b367e18293308ea522b54eec2b134fc3e7b5a
2022-03-03 01:36:13 +00:00
Automerger Merge Worker
a9f4d06ac6 Merge "Merge "Rename 'EMPTY' to 'SOLID_COLOR' for splash screen style." into tm-dev am: 7790c1b933" 2022-03-03 01:36:10 +00:00
Yuanjia Hsu
7830e0919b Merge "Add more methods for capture and injection" into tm-dev am: 8967e85cf4 am: 0431f3edf5
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16933471

Change-Id: I4d04e4f7769a733877feb06501c5cb5bf6954860
2022-03-03 01:35:28 +00:00
Wei Sheng Shih
35fef75f47 Merge "Rename 'EMPTY' to 'SOLID_COLOR' for splash screen style." into tm-dev am: 7790c1b933
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16963767

Change-Id: I9a8026df7cb89b61a2b0e130f507e0e8118b1047
2022-03-03 01:35:24 +00:00
Wei Sheng Shih
54797df3a9 Merge "Rename 'EMPTY' to 'SOLID_COLOR' for splash screen style." into tm-dev am: 7790c1b933
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16963767

Change-Id: I6abb0bb78ad69a0a5aa47d32bcd597ceb854c17c
2022-03-03 01:35:18 +00:00
Wei Sheng Shih
7790c1b933 Merge "Rename 'EMPTY' to 'SOLID_COLOR' for splash screen style." into tm-dev 2022-03-03 01:30:43 +00:00
Julia Reynolds
b19468b0c2 [automerger skipped] Filter notification APIs by user am: 4d7ca1dbce -s ours am: e749344386 -s ours am: c6e84150fa -s ours am: 3837076d84 -s ours am: 5a1cf350e6 -s ours am: e970e18130 -s ours am: d225baff76 -s ours
am skip reason: skipped by user juliacr

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

Change-Id: Icce6c980252650be1543d006c24616809c7bf5dd
2022-03-03 01:26:53 +00:00
Chiachang Wang
6a3d1376e1 Merge "Rename getRequiresInternetValidation to isInternetValidationRequired" am: d734ce3202 am: 8344626eba am: 590305ed33 am: b8a6ed34bb
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1990334

Change-Id: Ie126d1a6014be99de37764af9e3cc7db35cfd9df
2022-03-03 01:26:04 +00:00
Julia Reynolds
6bee91dd1a [automerger skipped] Filter notification APIs by user am: 4d7ca1dbce -s ours am: e749344386 -s ours am: c6e84150fa -s ours am: 3837076d84 -s ours am: 5a1cf350e6 -s ours am: e970e18130 -s ours am: d225baff76 -s ours
am skip reason: skipped by user juliacr

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

Change-Id: Iec5195fb4647fbe782530513b5dbc9feb491a3fc
2022-03-03 01:25:55 +00:00
Chiachang Wang
9b5374fae6 Merge "Rename getRequiresInternetValidation to isInternetValidationRequired" am: d734ce3202 am: 8344626eba am: 590305ed33 am: b8a6ed34bb
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1990334

Change-Id: I603c934897c84c18cf6448fa1e25da08482abc2b
2022-03-03 01:25:43 +00:00
Songchun Fan
c6e0a46a19 Merge "[pm] fix acquireAndRegisterNewAppId after app removal" into tm-dev am: 663a7ae5ce
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16992064

Change-Id: Iff23174a8a8e55b8b2f683a150a946a785d8a27c
2022-03-03 01:25:25 +00:00
Songchun Fan
7c090cd87b Merge "[pm] fix acquireAndRegisterNewAppId after app removal" into tm-dev am: 663a7ae5ce
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16992064

Change-Id: I4a7243d151939560cdbd0a01eb7f8daa61b84421
2022-03-03 01:24:54 +00:00
Jerry Chang
f94972694d Merge "Fix no touch events on half of the split screen" into tm-dev am: 16fc7aa4f5
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17053279

Change-Id: I2f554d7e59d90df0dedcbaed8f1d16cc568c364e
2022-03-03 01:24:37 +00:00
Jerry Chang
858e5c122f Merge "Fix no touch events on half of the split screen" into tm-dev am: 16fc7aa4f5
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17053279

Change-Id: Iee43593482dac7d53644257c44df714c386c2d60
2022-03-03 01:24:20 +00:00
Julia Reynolds
d97b8a0aec [automerger skipped] Filter notification APIs by user am: 4d7ca1dbce -s ours am: e749344386 -s ours am: c6e84150fa -s ours am: 3837076d84 -s ours am: 5a1cf350e6 -s ours am: 178be83f51 -s ours
am skip reason: skipped by user juliacr

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

Change-Id: I648912d92550081e0c2fc6fa11070ae5b8925984
2022-03-03 01:24:17 +00:00
Julia Reynolds
d225baff76 [automerger skipped] Filter notification APIs by user am: 4d7ca1dbce -s ours am: e749344386 -s ours am: c6e84150fa -s ours am: 3837076d84 -s ours am: 5a1cf350e6 -s ours am: e970e18130 -s ours
am skip reason: skipped by user juliacr

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

Change-Id: I158a485ab2c0ffd04441221ada796609637c9ccf
2022-03-03 01:24:11 +00:00
TreeHugger Robot
5acc9e406d Merge "Update the bubble overflow to match new visuals" into tm-dev am: c37e762e92
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17015413

Change-Id: I9998a73b16eef2759877d552780fd2bdaeda5ed1
2022-03-03 01:23:42 +00:00
TreeHugger Robot
c4f065742c Merge "Update the bubble overflow to match new visuals" into tm-dev am: c37e762e92
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17015413

Change-Id: I1a1ec7cdf03b853eba5eed294ff2e4ee6fefc654
2022-03-03 01:23:33 +00:00
Chiachang Wang
b8a6ed34bb Merge "Rename getRequiresInternetValidation to isInternetValidationRequired" am: d734ce3202 am: 8344626eba am: 590305ed33
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1990334

Change-Id: Id109413e335e1bb818f0b608927c6ce0feb10dd5
2022-03-03 01:23:15 +00:00
Songchun Fan
663a7ae5ce Merge "[pm] fix acquireAndRegisterNewAppId after app removal" into tm-dev 2022-03-03 01:22:12 +00:00
Jerry Chang
16fc7aa4f5 Merge "Fix no touch events on half of the split screen" into tm-dev 2022-03-03 01:21:46 +00:00
TreeHugger Robot
c37e762e92 Merge "Update the bubble overflow to match new visuals" into tm-dev 2022-03-03 01:16:37 +00:00
Rachel Lee
c04d5b9cb1 Merge "Cleanup Extended frame -> Vsync callback." into tm-dev am: acd10a9a97
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17037018

Change-Id: I700e0a19b6a26cebef3a921491103094e871145b
2022-03-03 01:15:35 +00:00
TreeHugger Robot
af1042b898 Merge "WebView: Revise setAlgorithmicDarkeningAllowed Javadoc" into tm-dev am: e7fffc65ad
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17036545

Change-Id: I936a65dcefbb62436c81ced8129b6a2d1bffd08a
2022-03-03 01:14:49 +00:00
Rachel Lee
81e2769ff3 Merge "Cleanup Extended frame -> Vsync callback." into tm-dev am: acd10a9a97
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17037018

Change-Id: I4c95f3457aa664be847ca02ab671a87dcd434f88
2022-03-03 01:14:22 +00:00
Hai Zhang
4d30f1fa7d Merge changes from topics "presubmit-am-4fce8d22f6ba4533875ba6f9fcf0183b", "presubmit-am-748689f93ea9431ca216195bbc7d9588" into tm-dev am: d0a198343b
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17049382

Change-Id: Ic081dcec8b4afb1d9803fd5e08dc46c833299519
2022-03-03 01:13:53 +00:00
TreeHugger Robot
c0da75a97b Merge "WebView: Revise setAlgorithmicDarkeningAllowed Javadoc" into tm-dev am: e7fffc65ad
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17036545

Change-Id: I45fa4a5a356b37662aca8bed732c187b4a247072
2022-03-03 01:13:48 +00:00
Hai Zhang
77c6a68044 Merge changes from topics "presubmit-am-4fce8d22f6ba4533875ba6f9fcf0183b", "presubmit-am-748689f93ea9431ca216195bbc7d9588" into tm-dev am: d0a198343b
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17049382

Change-Id: I37999b86c171b5891dba0028cb3c4b1caf7b2ff8
2022-03-03 01:13:22 +00:00
Yuanjia Hsu
015d0fa009 Merge "Add more methods for capture and injection" into tm-dev am: 8967e85cf4
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16933471

Change-Id: Iece6ea6e69bdf100e6087397e95c88abb54c1ce1
2022-03-03 01:13:00 +00:00
Yuanjia Hsu
0431f3edf5 Merge "Add more methods for capture and injection" into tm-dev am: 8967e85cf4
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16933471

Change-Id: I174f86a88811f1a9f1a19ff395fb3681008465e1
2022-03-03 01:12:33 +00:00
Rachel Lee
acd10a9a97 Merge "Cleanup Extended frame -> Vsync callback." into tm-dev 2022-03-03 01:05:52 +00:00
Chiachang Wang
590305ed33 Merge "Rename getRequiresInternetValidation to isInternetValidationRequired" am: d734ce3202 am: 8344626eba
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1990334

Change-Id: I791ae3f49e58c36eea2b3e5f31d5e2b717f458e6
2022-03-03 01:02:56 +00:00
Julia Reynolds
178be83f51 [automerger skipped] Filter notification APIs by user am: 4d7ca1dbce -s ours am: e749344386 -s ours am: c6e84150fa -s ours am: 3837076d84 -s ours am: 5a1cf350e6 -s ours
am skip reason: skipped by user juliacr

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

Change-Id: Id4db8ac4e42fdaff6d3c828c6a81efd23a86d409
2022-03-03 01:02:50 +00:00
Julia Reynolds
e970e18130 [automerger skipped] Filter notification APIs by user am: 4d7ca1dbce -s ours am: e749344386 -s ours am: c6e84150fa -s ours am: 3837076d84 -s ours am: 5a1cf350e6 -s ours
am skip reason: skipped by user juliacr

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

Change-Id: Id454251e239e86dd691af1220441e07b3989b03b
2022-03-03 01:01:53 +00:00