Commits · 88ad6db9f3737ed4283b409636c10cc01939bc1b · Farzin Kazemzadeh / platform_frameworks_base-old

Feb 09, 2021

Merge changes from topic "cdm_overlay-oc-mr1-dev" into oc-mr1-dev am:... · 88ad6db9

TreeHugger Robot authored 4 years ago

Merge changes from topic "cdm_overlay-oc-mr1-dev" into oc-mr1-dev am: 53825749 am: 08476180 am: 77d6da84

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4952f07571992a24f29a80063cd205b54592a5a1

88ad6db9

[automerger skipped] RESTRICT AUTOMERGE am: -s ours am: ... · 3f1fb650

Eugene Susla authored 4 years ago

[automerger skipped] RESTRICT AUTOMERGE am: 6a5777dd -s ours am: 80d04319 -s ours am: 4a510d0f

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I51e17655a64f6d3c6ed5a8eac5a22d6eebb68c38

3f1fb650

Merge changes from topic "cdm_overlay-qt-dev" into qt-dev am: · a9641173

TreeHugger Robot authored 4 years ago

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I365cb6b774ccb9a4d73654b73bfde00ef2eaf327

a9641173

RESTRICT AUTOMERGE am: · 4d587c5a

Eugene Susla authored 4 years ago

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia0ce89b57ab01e6316b5cad5854b26624b460043

4d587c5a

Feb 08, 2021
- resolve merge conflicts of 540b50bb to qt-qpr1-dev · 8750762c
  Michael Groover authored 4 years ago
  
  Bug: 173421434 Change-Id: Ie3b327c2ab900616b2137d8347d5e8560484ec40 Merged-In: I9b8786a321b1ba79d81b74c3041589f30df8e9c8
  8750762c
- Merge "resolve merge conflicts of a13fc7f3 to... · 6d4ff2e0
  TreeHugger Robot authored 4 years ago
  
  Merge "resolve merge conflicts of a13fc7f3 to qt-qpr1-dev" into qt-qpr1-dev
  6d4ff2e0
Feb 05, 2021

resolve merge conflicts of to qt-qpr1-dev · 9b85c641

Michael Groover authored 4 years ago

Bug: 173421434

Change-Id: Ia5912645861a88e819189321861ffd81240c34d6
Merged-In: I03072c65e1c7101538a7a20541d2ac59a2d213e3

9b85c641

Feb 03, 2021

Merge "[DO NOT MERGE] Close screenshot process on user switched" into qt-qpr1-dev · 21eb07cf
Miranda Kephart authored 4 years ago

21eb07cf

Merge changes from topic "cdm_overlay-oc-mr1-dev" into oc-mr1-dev am: am: · 77d6da84

TreeHugger Robot authored 4 years ago

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib1166627468f5d11aef69301318658eb7f4aae84

77d6da84

[automerger skipped] RESTRICT AUTOMERGE am: -s ours am: -s ours · 4a510d0f

Eugene Susla authored 4 years ago

am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia27241123b2266977e887afd36f17ceae35c8c2b

4a510d0f

Merge changes from topic "cdm_overlay-qt-dev" into qt-dev · 67596632

TreeHugger Robot authored 4 years ago

* changes:
  RESTRICT AUTOMERGE Allow CDM to hide overlays
  RESTRICT AUTOMERGE Prevent non-system overlays from showing over CDM UI

67596632

Merge changes from topic "cdm_overlay-oc-mr1-dev" into oc-mr1-dev am: · 08476180

TreeHugger Robot authored 4 years ago

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8033d0e1c60c957aa149c052dd1ba653f5449d5d

08476180

[automerger skipped] RESTRICT AUTOMERGE am: -s ours · 80d04319

Eugene Susla authored 4 years ago

am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia736a9acfe1f91e2a8d86cb8b7221a1472e5195f

80d04319

Merge changes from topic "cdm_overlay-oc-mr1-dev" into oc-mr1-dev · 53825749

TreeHugger Robot authored 4 years ago

* changes:
  RESTRICT AUTOMERGE Allow CDM to hide overlays
  RESTRICT AUTOMERGE Prevent non-system overlays from showing over CDM UI

53825749

Merge changes from topic "173421434-SubInfo-ICCID-qt-dev" into qt-dev · 540b50bb

Michael Groover authored 4 years ago

* changes:
  Add method to clear out SubscriptionInfo#getCardString
  Whitelist READ_PRIVILEGED_PHONE_STATE for the contacts provider
  Update the getIccId docs to reflect access requirements

540b50bb

Feb 02, 2021

Merge changes from topic "cdm_overlay-pi-dev" into pi-dev am: am: · 82b0600b

TreeHugger Robot authored 4 years ago

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I64ece3292d6cd088455547b0365ea4ffc8e6378c

82b0600b

[automerger skipped] RESTRICT AUTOMERGE am: -s ours am: · 175d275b

Eugene Susla authored 4 years ago

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1bdb66b2c06a2a1ae249c0eb31dac2ae8101fbbb

175d275b

Merge changes from topic "cdm_overlay-pi-dev" into pi-dev am: · 260d69a4

TreeHugger Robot authored 4 years ago

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4dc66b1d02903fbf4bdbd6053787168281bedcd6

260d69a4

[automerger skipped] RESTRICT AUTOMERGE am: -s ours · 56cc3b82

Eugene Susla authored 4 years ago

am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I59451725f8eea4a9a6587d7f8d3272a24ee486e4

56cc3b82

[automerger skipped] Merge "[SettingsProvider] extend font size scale range"... · 146953df

TreeHugger Robot authored 4 years ago

[automerger skipped] Merge "[SettingsProvider] extend font size scale range" into qt-dev am: a9638beb -s ours

am skip reason: Change-Id Icff82d727d63da4353342b0f9a5ca3c2ae1671c1 with SHA-1 b7d4c809 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2843e5d6ac13dc77185a4ab5647c521042656b57

146953df

Merge changes from topic "cdm_overlay-pi-dev" into pi-dev · 99e5a28c

TreeHugger Robot authored 4 years ago

* changes:
  RESTRICT AUTOMERGE Allow CDM to hide overlays
  RESTRICT AUTOMERGE Prevent non-system overlays from showing over CDM UI

99e5a28c

Merge "[SettingsProvider] extend font size scale range" into qt-qpr1-dev · 4097309f
TreeHugger Robot authored 4 years ago

4097309f
Merge "[SettingsProvider] extend font size scale range" into qt-dev · a9638beb
TreeHugger Robot authored 4 years ago

a9638beb

Jan 29, 2021

[automerger skipped] Merge "Only allow BROWSABLE && DEFAULT Intents to be... · 06985dae

TreeHugger Robot authored 4 years ago

[automerger skipped] Merge "Only allow BROWSABLE && DEFAULT Intents to be always opened" into pi-dev am: 47fb5ee2 -s ours am: 589f5387 -s ours

am skip reason: Change-Id Ib957258735893bf2779bed19bd400c6726ee6478 with SHA-1 5a90c4c7 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7cd0880df0f5c6a802a0275abf7fad619366e00e

06985dae

[automerger skipped] Merge "Only allow BROWSABLE && DEFAULT Intents to be... · 589f5387

TreeHugger Robot authored 4 years ago

[automerger skipped] Merge "Only allow BROWSABLE && DEFAULT Intents to be always opened" into pi-dev am: 47fb5ee2 -s ours

am skip reason: Change-Id Ib957258735893bf2779bed19bd400c6726ee6478 with SHA-1 dca1c94f is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If3a42027376c2e65eab1219c9791f6862cc30ca5

589f5387

[automerger skipped] Merge "Only allow BROWSABLE && DEFAULT Intents to be... · 5d2fa81d

TreeHugger Robot authored 4 years ago

[automerger skipped] Merge "Only allow BROWSABLE && DEFAULT Intents to be always opened" into qt-dev am: d7c5e63b -s ours

am skip reason: Change-Id Ib957258735893bf2779bed19bd400c6726ee6478 with SHA-1 5a90c4c7 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib3f3273fb2f73fb206d7d686abe80b9b679e1e3e

5d2fa81d

Merge "Only allow BROWSABLE && DEFAULT Intents to be always opened" into pi-dev · 47fb5ee2
TreeHugger Robot authored 4 years ago

47fb5ee2
Merge "Only allow BROWSABLE && DEFAULT Intents to be always opened" into qt-dev · d7c5e63b
TreeHugger Robot authored 4 years ago

d7c5e63b
Merge "Only allow BROWSABLE && DEFAULT Intents to be always opened" into qt-qpr1-dev · 35f36d2d
TreeHugger Robot authored 4 years ago

35f36d2d

Jan 28, 2021

[automerger skipped] Merge "Only allow BROWSABLE && DEFAULT Intents to be... · 06885a55

TreeHugger Robot authored 4 years ago

[automerger skipped] Merge "Only allow BROWSABLE && DEFAULT Intents to be always opened" into oc-mr1-dev am: f4a72918 -s ours am: df0b2e99 am: a4e5fdf1

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5dd1c0934d2fed75281e3e72ca63ca7c14d1bc31

06885a55

[automerger skipped] Merge "Only allow BROWSABLE && DEFAULT Intents to be... · a4e5fdf1

TreeHugger Robot authored 4 years ago

[automerger skipped] Merge "Only allow BROWSABLE && DEFAULT Intents to be always opened" into oc-mr1-dev am: f4a72918 -s ours am: df0b2e99

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie1217436408739f926bd3958df835fe9f281288b

a4e5fdf1

[automerger skipped] Merge "Only allow BROWSABLE && DEFAULT Intents to be... · df0b2e99

TreeHugger Robot authored 4 years ago

[automerger skipped] Merge "Only allow BROWSABLE && DEFAULT Intents to be always opened" into oc-mr1-dev am: f4a72918 -s ours

am skip reason: skipped by user chiuwinson

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I679f76f348dfc1d72eb42e3704faa8208409ef0c

df0b2e99

Merge "Only allow BROWSABLE && DEFAULT Intents to be always opened" into oc-mr1-dev · f4a72918
TreeHugger Robot authored 4 years ago

f4a72918

[DO NOT MERGE] Close screenshot process on user switched · 41a97a3f

Miranda Kephart authored 4 years ago

Currently, we keep the process up even if the user switches,
meaning that in some cases (if the user is switched while the
screenshot UI is up) we will save images to the wrong profile.
This change makes ScreenshotHelper listen for user switches and
close the screenshot service, so that a new screenshot is
guaranteed to be constructed with the correct user's context.

Bug: 170474245
Fix: 170474245
Test: manual -- verified bad state occurs if user switches within
the timeout period, ensured that screenshots work immediately
after switching with this change.

Change-Id: I9d32d0928e6c2bda161d04555438d0dd7afef0ba
(cherry picked from commit 7ef1a5dd)

41a97a3f

Jan 26, 2021

[automerger skipped] Merge "DO NOT MERGE: WM: Only allow system to use... · d3eb04e7

Rob Carr authored 4 years ago

[automerger skipped] Merge "DO NOT MERGE: WM: Only allow system to use NO_INPUT_CHANNEL." into oc-mr1-dev am: e3f76444 -s ours am: aa682dec -s ours am: a22cfe0b

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1cb556ca775bbfbe4346eab371a1cc5b77acac31

d3eb04e7

[automerger skipped] Merge "DO NOT MERGE: WM: Only allow system to use... · 74f95bbb

Rob Carr authored 4 years ago

[automerger skipped] Merge "DO NOT MERGE: WM: Only allow system to use NO_INPUT_CHANNEL." into pi-dev am: 4f162df1 -s ours am: bbd4d450

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9118e44b35a309a57bbab3073dad028c69fe705f

74f95bbb

[automerger skipped] Merge "DO NOT MERGE: WM: Only allow system to use... · a22cfe0b

Rob Carr authored 4 years ago

[automerger skipped] Merge "DO NOT MERGE: WM: Only allow system to use NO_INPUT_CHANNEL." into oc-mr1-dev am: e3f76444 -s ours am: aa682dec -s ours

am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia295a8f7839dc362ca05c4141aaeca0d0fc58fe5

a22cfe0b

[automerger skipped] Merge "DO NOT MERGE: WM: Only allow system to use... · bbd4d450

Rob Carr authored 4 years ago

[automerger skipped] Merge "DO NOT MERGE: WM: Only allow system to use NO_INPUT_CHANNEL." into pi-dev am: 4f162df1 -s ours

am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9ea5c9bb7a472f04cf6b65f6efe31e7c1223e873

bbd4d450

[automerger skipped] Merge "DO NOT MERGE: WM: Only allow system to use... · aa682dec

Rob Carr authored 4 years ago

[automerger skipped] Merge "DO NOT MERGE: WM: Only allow system to use NO_INPUT_CHANNEL." into oc-mr1-dev am: e3f76444 -s ours

am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I505e9e636e908e23e3b229262e522dd628d2faff

aa682dec

Merge "DO NOT MERGE: WM: Only allow system to use NO_INPUT_CHANNEL." into qt-dev am: · 9089b9f1

Rob Carr authored 4 years ago

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I40066702ef4d4952e4bb3a7d533d9fddb4f53715

9089b9f1