Commit Graph

53269 Commits

Author SHA1 Message Date
Jakub Pawlowski
f3afef8419 Prevent overlay drawing on top of Bluetooth pairing dialog
Bug: 155648639
Change-Id: I99643ee9084f3a9bc1ad9a459ac27c587d832c91
Merged-In: I99643ee9084f3a9bc1ad9a459ac27c587d832c91
2020-06-22 17:35:40 +02:00
Sunny Shao
2a2639f193 [automerger skipped] Allows to launch only authenticator owned activities am: 818fef48f3 am: 9c6ab4cbd3 -s ours am: 2b11f44b90 -s ours
am skip reason: Change-Id I5ce1a0b3838db7b3fbe48c6ea23d5f093d625cdb with SHA-1 c8f92acbfb is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11802014

Change-Id: I8dc9137ebe410ae8b4484c2fe489a9e7caa6ac59
2020-06-20 04:56:22 +00:00
Sunny Shao
2b11f44b90 [automerger skipped] Allows to launch only authenticator owned activities am: 818fef48f3 am: 9c6ab4cbd3 -s ours
am skip reason: Change-Id I5ce1a0b3838db7b3fbe48c6ea23d5f093d625cdb with SHA-1 c8f92acbfb is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11802014

Change-Id: I4dd7f5ec61df98fd6ab2b7c7f9c76d29517fa42a
2020-06-20 04:44:00 +00:00
Sunny Shao
9c6ab4cbd3 Allows to launch only authenticator owned activities am: 818fef48f3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11802014

Change-Id: I931654780a07f5e8f52dc875854545771d99bcde
2020-06-20 04:32:24 +00:00
Sunny Shao
af9bdcb4b5 [automerger skipped] Allows to launch only authenticator owned activities am: c8f92acbfb -s ours
am skip reason: Change-Id I5ce1a0b3838db7b3fbe48c6ea23d5f093d625cdb with SHA-1 addc1ea1b9 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11802012

Change-Id: I744c94080ee322f7def92065538b39ef0b9213d4
2020-06-20 04:20:17 +00:00
Jakub Pawlowski
ac67100423 Prevent overlay drawing on top of Bluetooth discovery request dialog
Bug: 155650356
Change-Id: I9cee6e5bb8cef77aa385d664fe0738db1496ef20
Merged-In: I9cee6e5bb8cef77aa385d664fe0738db1496ef20
2020-06-10 07:49:25 +00:00
Sunny Shao
818fef48f3 Allows to launch only authenticator owned activities
- 3rd party developers can define himself-authenticator
  and use the accountPreferences attribute to load the
  predefined preference UI.
- If a developer defines an action intent to launch the
  other activity in xml and it would return true due
  to the true exported attribute and no permission.
- To avoid launching arbitrary activity. Here allows
  to launch only authenticator owned activities.

Bug: 150946634
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=com.android.settings.accounts
Test: PoC app
Change-Id: I5ce1a0b3838db7b3fbe48c6ea23d5f093d625cdb
Merged-In: I5ce1a0b3838db7b3fbe48c6ea23d5f093d625cdb
(cherry picked from commit d6d8f98844)
2020-06-09 10:11:04 +00:00
Sunny Shao
e2eab4e258 Allows to launch only authenticator owned activities
- 3rd party developers can define himself-authenticator
  and use the accountPreferences attribute to load the
  predefined preference UI.
- If a developer defines an action intent to launch the
  other activity in xml and it would return true due
  to the true exported attribute and no permission.
- To avoid launching arbitrary activity. Here allows
  to launch only authenticator owned activities.

Bug: 150946634
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=com.android.settings.accounts
Test: PoC app
Change-Id: I5ce1a0b3838db7b3fbe48c6ea23d5f093d625cdb
Merged-In: I5ce1a0b3838db7b3fbe48c6ea23d5f093d625cdb
(cherry picked from commit d6d8f98844)
2020-06-09 10:09:23 +00:00
Sunny Shao
c8f92acbfb Allows to launch only authenticator owned activities
- 3rd party developers can define himself-authenticator
  and use the accountPreferences attribute to load the
  predefined preference UI.
- If a developer defines an action intent to launch the
  other activity in xml and it would return true due
  to the true exported attribute and no permission.
- To avoid launching arbitrary activity. Here allows
  to launch only authenticator owned activities.

Bug: 150946634
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=com.android.settings.accounts
Test: PoC app
Change-Id: I5ce1a0b3838db7b3fbe48c6ea23d5f093d625cdb
Merged-In: I5ce1a0b3838db7b3fbe48c6ea23d5f093d625cdb
(cherry picked from commit d6d8f98844)
2020-06-09 10:07:10 +00:00
Sunny Shao
addc1ea1b9 Allows to launch only authenticator owned activities
- 3rd party developers can define himself-authenticator
  and use the accountPreferences attribute to load the
  predefined preference UI.
- If a developer defines an action intent to launch the
  other activity in xml and it would return true due
  to the true exported attribute and no permission.
- To avoid launching arbitrary activity. Here allows
  to launch only authenticator owned activities.

Bug: 150946634
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=com.android.settings.accounts
Test: PoC app
Change-Id: I5ce1a0b3838db7b3fbe48c6ea23d5f093d625cdb
Merged-In: I5ce1a0b3838db7b3fbe48c6ea23d5f093d625cdb
(cherry picked from commit d6d8f98844)
2020-06-09 10:02:25 +00:00
Jakub Pawlowski
e61467cd6c Prevent overlay drawing on top of Bluetooth discovery request dialog am: c48d63752a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11484059

Change-Id: I3572c16dd2b47189dc26ae4cd99f569d32b6ae2a
2020-06-08 05:55:40 +00:00
Jakub Pawlowski
c48d63752a Prevent overlay drawing on top of Bluetooth discovery request dialog
Bug: 155650356
Change-Id: I9cee6e5bb8cef77aa385d664fe0738db1496ef20
2020-06-04 06:45:16 +00:00
Jakub Pawlowski
3f5bf02fd8 Prevent overlay drawing on top of Bluetooth pairing dialog
Bug: 155648639
Change-Id: I99643ee9084f3a9bc1ad9a459ac27c587d832c91
Merged-In: I99643ee9084f3a9bc1ad9a459ac27c587d832c91
2020-06-03 12:17:34 +00:00
Jakub Pawlowski
103cc7cf29 Prevent overlay drawing on top of Bluetooth pairing dialog am: 88815d1456
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11484060

Change-Id: Ib47c1804cbb29942c33152d72e1019c92f0d3856
2020-06-03 09:59:18 +00:00
TreeHugger Robot
8e7fa0958a Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev 2020-05-15 21:13:40 +00:00
Bill Yi
c1bb4c3045 Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Change-Id: If1e3664a49ff6fa6582310eb0b3bc7aa8a620423
2020-05-14 21:56:56 -07:00
Bill Yi
5f50215f6b Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Change-Id: I5f3e159c71ba612729b775ce6e9a43ea56ce5a15
2020-05-14 21:13:24 -07:00
Sunny Shao
4b6e82fd5d Allows to launch only authenticator owned activities
- 3rd party developers can define himself-authenticator
  and use the accountPreferences attribute to load the
  predefined preference UI.
- If a developer defines an action intent to launch the
  other activity in xml and it would return true due
  to the true exported attribute and no permission.
- To avoid launching arbitrary activity. Here allows
  to launch only authenticator owned activities.

Bug: 150946634
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=com.android.settings.accounts
Test: PoC app
Change-Id: I5ce1a0b3838db7b3fbe48c6ea23d5f093d625cdb
Merged-In: I5ce1a0b3838db7b3fbe48c6ea23d5f093d625cdb
(cherry picked from commit d6d8f98844)
2020-05-15 01:50:56 +00:00
Jakub Pawlowski
88815d1456 Prevent overlay drawing on top of Bluetooth pairing dialog
Bug: 155648639
Change-Id: I99643ee9084f3a9bc1ad9a459ac27c587d832c91
2020-05-14 09:18:52 +00:00
Bill Yi
f6f96f8a85 Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Change-Id: Ia460d84145b5e6f1ff7a4fb93ad34510ed1a6800
2020-04-18 22:28:22 -07:00
TreeHugger Robot
5064d96e3a Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev 2020-04-08 00:18:18 +00:00
Bill Yi
31e944a20a Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Change-Id: I5302a1941d87bc6bc89039c91b5e4799f94259ec
2020-04-07 15:50:51 -07:00
Bill Yi
ae901dc181 Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Change-Id: I7094db11ac59ba3a27a9767e0b75b33ebe3a42f7
2020-04-07 15:17:43 -07:00
TreeHugger Robot
9643b9c727 Merge "Hide unprovisioned MDN (phone number) at select profile dialog" into qt-qpr1-dev 2020-04-06 03:49:07 +00:00
Bill Yi
9f8e7a90d8 Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Change-Id: Iced480939d3fa27302bdbe2a6701220c61e9511f
2020-04-03 21:52:12 -07:00
Peter Wang
6758ca661e Hide unprovisioned MDN (phone number) at select profile dialog
Bug: 151773922
Fix: 151773922
Test: Build
Change-Id: If84600cc426fefcdd219c4a44a5510b8db5c0a89
Merged-In: If84600cc426fefcdd219c4a44a5510b8db5c0a89
2020-04-03 00:09:39 -07:00
TreeHugger Robot
dd6e85b216 Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev 2020-04-02 04:24:36 +00:00
Bill Yi
e6b95c40b4 Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Change-Id: Ice5352ce325a55055947f2763bf3d2018c7f0d90
2020-04-01 20:06:38 -07:00
Bill Yi
f639851869 Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Change-Id: Iae5c7783da1e785d2eb209fa870a564f505e6e9e
2020-04-01 19:35:23 -07:00
Stanley Wang
0b76ef19b5 Merge "Fix security issue for using mock location without permission." into qt-qpr1-dev 2020-03-27 03:09:09 +00:00
TreeHugger Robot
3c137d807d Merge "Fix pendingIntent in SettingsSliceProvider could be Hijacked" into qt-qpr1-dev 2020-03-20 02:51:54 +00:00
Sarah Chin
bd8bbca27c Merge "5G meteredness for telephony framework" into qt-qpr1-dev 2020-03-19 19:11:00 +00:00
Sarah Chin
20974b6814 5G meteredness for telephony framework
Add listener for SubscriptionPlans changed

Bug: 151630253
Test: atest FrameworksTelephonyTests
Change-Id: I0c8e84f74fd1f69ffc7e1046819966fcb04732a6
Merged-In: I0c8e84f74fd1f69ffc7e1046819966fcb04732a6
2020-03-17 18:47:07 +00:00
Bill Yi
8f23d00553 Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Change-Id: I88eb61ab20394d1cf91380f2823a536faaa8619c
2020-03-17 04:18:33 -07:00
Bill Yi
d49c677499 Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Change-Id: Ic27dcb9095c3058386601a78f844419467f147a1
2020-03-16 08:20:15 -07:00
TreeHugger Robot
8697de6be3 Merge "DO NOT MERGE" into qt-qpr1-dev 2020-03-12 10:36:01 +00:00
Automerger Merge Worker
5f2520f685 [automerger skipped] Merge "RESTRICT AUTOMERGE Allow LockScreenPattern to be launched in the pinning screen" into pi-dev am: f2754332a0 -s ours am: 10caf51f27 -s ours
am skip reason: Change-Id I8070de79a83350d1658efcb19e983669dad0e673 with SHA-1 077dd9b07f is in history

Change-Id: I19964afedd126b92b35977cc0a97abe1b8fb9ffc
2020-03-12 02:09:20 +00:00
Automerger Merge Worker
10caf51f27 [automerger skipped] Merge "RESTRICT AUTOMERGE Allow LockScreenPattern to be launched in the pinning screen" into pi-dev am: f2754332a0 -s ours
am skip reason: subject contains skip directive

Change-Id: I26c2fcfc1c38818d168667d1121a0cde3018c566
2020-03-12 01:51:17 +00:00
TreeHugger Robot
f2754332a0 Merge "RESTRICT AUTOMERGE Allow LockScreenPattern to be launched in the pinning screen" into pi-dev 2020-03-12 01:35:21 +00:00
Automerger Merge Worker
18d9d24ee3 [automerger skipped] RESTRICT AUTOMERGE am: 101c9be6c1 -s ours am: a3ddb0c4fb -s ours am: 31933bea45 -s ours
am skip reason: Change-Id I8070de79a83350d1658efcb19e983669dad0e673 with SHA-1 077dd9b07f is in history

Change-Id: I0f6d8eeec8469cfe05b36bfbf27687be2973108a
2020-03-11 20:29:24 +00:00
Automerger Merge Worker
31933bea45 [automerger skipped] RESTRICT AUTOMERGE am: 101c9be6c1 -s ours am: a3ddb0c4fb -s ours
am skip reason: subject contains skip directive

Change-Id: Ic0716de563c854768010f78b01ee4cbd546e99a0
2020-03-11 20:17:25 +00:00
Automerger Merge Worker
fe302e4867 Merge "RESTRICT AUTOMERGE Allow LockScreenPattern to be launched in the pinning screen" into qt-dev am: 5e788604c2
Change-Id: I0b9346370cf28648659d38a6a2bdeb0f893195f5
2020-03-11 20:05:37 +00:00
Automerger Merge Worker
19ff9101ee RESTRICT AUTOMERGE am: 077dd9b07f
Change-Id: I73f9a68326f6e6c477fc43eeb84b3349f519b658
2020-03-11 20:05:35 +00:00
Automerger Merge Worker
a3ddb0c4fb [automerger skipped] RESTRICT AUTOMERGE am: 101c9be6c1 -s ours
am skip reason: subject contains skip directive

Change-Id: I5ec3ba82e851a69ab1d7aff75603ad6a674661fd
2020-03-11 20:05:00 +00:00
TreeHugger Robot
5e788604c2 Merge "RESTRICT AUTOMERGE Allow LockScreenPattern to be launched in the pinning screen" into qt-dev 2020-03-11 17:51:30 +00:00
Christopher Tate
36f182159f DO NOT MERGE - Track framework changes to crashApplication
Bug: 128649910
Test: manual
Test: atest OsHostTests#testForegroundServiceBadNotification
Merged-In: Ia613372360f8b32f6ad3b7d2092e7cb27f067fbc
Change-Id: I6894e3df309669ba98ad23432aa18d6043739aad
2020-03-10 15:52:05 -07:00
Kenny Guy
37295f86bf DO NOT MERGE
Update battery manager toggle to support on / off summary.

Screenshots attached to the bug.

Bug: 148847755
Test: Visual - on blueline aosp build / boot / check settings pages
Test: Visual - on blueline eng build / boot / check settings pages
Change-Id: I44b1c74baf4bafa549519d4f20fa470389cd5e0b
(cherry picked from commit 1a289bdeba)
2020-03-10 16:10:29 +00:00
Tsung-Mao Fang
91399607fe Fix pendingIntent in SettingsSliceProvider could be Hijacked
A malicious app is able to obtain this pending intent.
It can then mutate all fields except for the action and
launch the intent. This can be used to launch any activity
with the ACTION_SETTINGS action.

So, we enfore assign the package name for this intent,
it only can launch the settings app.

Fix: 147355897
Test: a) Install the new settings apk, and it won't launch other screen.
(See details in bug)
b) Start the settings search, slice search results work as normal.

Change-Id: Ie954d8a4b7153d6a4cac40621f363b45185990f2
(cherry picked from commit b3c0a2a6c1)
Merged-In: Ie954d8a4b7153d6a4cac40621f363b45185990f2
2020-03-06 18:14:03 +08:00
Chris Tate
12ed043fdb Revert "DO NOT MERGE - Track framework changes to crashApplicati..."
Revert submission 10556828-am-2e2e7004e4cb4ef8b776d65e9ffe33f3

Reason for revert: Should never have automerged downstream from qt-dev; the entire topic should have been skipped.
Reverted Changes:
I241d8d8da:DO NOT MERGE - Track framework changes to crashApp...
Ib1a5695f9:[automerger skipped] Merge "DO NOT MERGE - Add tes...
I3e6eb3f5c:[automerger skipped] Merge "DO NOT MERGE - Kill ap...
Ibe4652916:DO NOT MERGE - Track framework changes to crashApp...

Change-Id: Ic68e376aa93c5c22a499d87f001bd22314c3f46e
2020-03-06 03:54:52 +00:00
Automerger Merge Worker
86ce68877f DO NOT MERGE - Track framework changes to crashApplication API am: 4a89abe279
Change-Id: Ibe465291626661a7bcd4ad38e11ff1525fbab512
2020-03-06 01:35:03 +00:00