Commit Graph

15223 Commits

Author SHA1 Message Date
Phil Weaver
41492a1e2c Merge "Back-port ag/2491664" into lmp-dev 2017-07-18 18:19:39 +00:00
Phil Weaver
98e0930394 DO NOT MERGE Back-port ag/2491664 am: 9a14484b38 am: 840b78e19e
am: bebc9f9f3c  -s ours

Change-Id: I1d6d10dace8425eb21bacd9582404e876da2db7c
2017-07-12 21:59:38 +00:00
Phil Weaver
bebc9f9f3c DO NOT MERGE Back-port ag/2491664 am: 9a14484b38
am: 840b78e19e

Change-Id: I5b2add698df347db16bfedb196793ea77b70f8a8
2017-07-12 21:55:38 +00:00
Phil Weaver
840b78e19e DO NOT MERGE Back-port ag/2491664
am: 9a14484b38

Change-Id: Ie1a9075d996f38ac8bbe56e19880bbfd6b9f9a96
2017-07-12 21:43:49 +00:00
Phil Weaver
485d94a7ef Back-port ag/2491664
Bug: 62196835
Test: Verify overlays disappear on a11y capabilities
dialog.

Change-Id: Ic675012dd9faa8e53d1d4b126b3ba68fecdab992
2017-07-12 14:07:07 -07:00
Phil Weaver
9a14484b38 DO NOT MERGE Back-port ag/2491664
Bug: 62196835
Test: Verify overlays disappear on a11y capabilities
dialog.

Change-Id: Icbd00799e4b12cde9d17d3d0abbd38d9643b26c4
2017-07-12 20:50:13 +00:00
Dmitry Dementyev
22db6274bf Add permission check to Intents used by Authenticator Settings. am: ea55e6331e am: bac5163a9a
am: 0c07b38054  -s ours

Change-Id: Ibb0be31c8bf222d0c823142e075db819a3a52047
2017-04-12 19:26:32 +00:00
Dmitry Dementyev
0c07b38054 Add permission check to Intents used by Authenticator Settings. am: ea55e6331e
am: bac5163a9a

Change-Id: Ib70241c596aca047a096318eb2026634692f8620
2017-04-12 19:21:36 +00:00
Dmitry Dementyev
bac5163a9a Add permission check to Intents used by Authenticator Settings.
am: ea55e6331e

Change-Id: Iafaa143dd3c3201f16d1e19cb150243fd5f88232
2017-04-12 19:16:01 +00:00
Dmitry Dementyev
ea55e6331e Add permission check to Intents used by Authenticator Settings.
Setting shares system uid and can be used to bypass different security
checks.
We add proper handling for intents which resolve toexported=true
activities with permission filed.
Added nested preferences filtering.

Bug: 33123882
Test: manual tests
Change-Id: I3ba9c768fc4f8093dcf2eadc17f14c506ec5c327
Merged-In: Ib5bab7989fc44b4391f9050c6b18f81c58c09cf6
2017-03-28 13:53:10 -07:00
Dmitry Dementyev
75ae46d035 Add permission check to Intents used by Authenticator Settings.
Setting shares system uid and can be used to bypass different security
checks.
We add proper handling for intents which resolve toexported=true
activities with permission filed.
Added nested preferences filtering.

Bug: 33123882
Test: manual tests
Change-Id: Ib5bab7989fc44b4391f9050c6b18f81c58c09cf6
2017-02-21 11:05:45 -08:00
Zach Jang
2e006b2b07 am b7e865ee: (-s ours) am 0431bc18: am e7e0c03f: DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3
* commit 'b7e865ee486ea255e0f76c4d0129d608a7e7995d':
  DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3
2015-09-17 20:27:21 +00:00
Zach Jang
b7e865ee48 am 0431bc18: am e7e0c03f: DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3
* commit '0431bc18b85c410d14bbfd0dbcc87d54edbb1507':
  DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3
2015-09-17 20:16:45 +00:00
Zach Jang
0431bc18b8 am e7e0c03f: DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3
* commit 'e7e0c03f003930461603ae71ec0ce815d5a7f40a':
  DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3
2015-09-17 20:04:24 +00:00
Zach Jang
6ceb2ba9b8 DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings
CL#3/3

b/23946860

Change-Id: I2cfcfcbc28d6a1391cae55f505a2b981df9ade2c
2015-09-14 14:03:12 -07:00
Zach Jang
e7e0c03f00 DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings
CL#3/3

b/23946860

Change-Id: Idd318380829f20616d4f1691965b55bfff3afbe0
2015-09-12 00:40:20 +00:00
Sanket Padawe
158fa95218 am df9b13af: am 74d85949: am e05f7143: Check for special char when renaming device for Wi-Fi direct.
* commit 'df9b13af9bff0858c787000f1accee7dd1d2874d':
  Check for special char when renaming device for Wi-Fi direct.
2015-07-29 17:08:45 +00:00
Sanket Padawe
df9b13af9b am 74d85949: am e05f7143: Check for special char when renaming device for Wi-Fi direct.
* commit '74d85949507f3d9fdc75ace2acbec1aa7503b034':
  Check for special char when renaming device for Wi-Fi direct.
2015-07-29 16:44:58 +00:00
Sanket Padawe
74d8594950 am e05f7143: Check for special char when renaming device for Wi-Fi direct.
* commit 'e05f71431548cba1b14807ba7f07a5df89c3f0a4':
  Check for special char when renaming device for Wi-Fi direct.
2015-07-29 16:15:17 +00:00
Sanket Padawe
e05f714315 Check for special char when renaming device for Wi-Fi direct.
Bug: 21141820
Change-Id: I78231d95e5ba3f505325d5657f8e6106a887f11e
(cherry picked from commit 7186a47ef3)
2015-07-28 16:09:59 +00:00
Fyodor Kupolov
83930bc3ee am a6c8a0e6: am d8b606b8: am 2f3bc3cb: (-s ours) am e3904c4f: am e8e7b9b3: Added a check if a custom activity can be started automerge: 3a3ff59
automerge: 5b2b7e1

* commit '5b2b7e189766e889118059902a15a4ce2c127e9d':
2015-01-29 20:34:29 +00:00
Fyodor Kupolov
5b2b7e1897 am a6c8a0e6: am d8b606b8: am 2f3bc3cb: (-s ours) am e3904c4f: am e8e7b9b3: Added a check if a custom activity can be started
automerge: 3a3ff59

* commit '3a3ff591976ef7503d382be2897cad5710cd80e7':
  Added a check if a custom activity can be started
2015-01-29 19:39:59 +00:00
Fyodor Kupolov
9e432a698b am d7e93570: am f11f9f47: Added a check if a custom activity can be started automerge: 57641a8
automerge: 0738bae

* commit '0738bae9164b150ce81b8cba57be9105a0308115':
2015-01-29 19:29:20 +00:00
Fyodor Kupolov
77a2e3d625 am 3a3ff591: am a6c8a0e6: am d8b606b8: am 2f3bc3cb: (-s ours) am e3904c4f: am e8e7b9b3: Added a check if a custom activity can be started
* commit '3a3ff591976ef7503d382be2897cad5710cd80e7':
  Added a check if a custom activity can be started
2015-01-29 19:03:01 +00:00
Fyodor Kupolov
3a3ff59197 am a6c8a0e6: am d8b606b8: am 2f3bc3cb: (-s ours) am e3904c4f: am e8e7b9b3: Added a check if a custom activity can be started
* commit 'a6c8a0e66d92bde12ae6f1934f020e7700db05d1':
  Added a check if a custom activity can be started
2015-01-29 18:57:22 +00:00
Fyodor Kupolov
a6c8a0e66d am d8b606b8: am 2f3bc3cb: (-s ours) am e3904c4f: am e8e7b9b3: Added a check if a custom activity can be started
* commit 'd8b606b81a5ed77d3d2cbbaa7de26853126c25d7':
  Added a check if a custom activity can be started
2015-01-29 18:50:43 +00:00
Fyodor Kupolov
d8b606b81a am 2f3bc3cb: (-s ours) am e3904c4f: am e8e7b9b3: Added a check if a custom activity can be started
* commit '2f3bc3cb3f5add3962fb0ad441c27d44fede7787':
  Added a check if a custom activity can be started
2015-01-29 18:45:51 +00:00
Fyodor Kupolov
0738bae916 am d7e93570: am f11f9f47: Added a check if a custom activity can be started
automerge: 57641a8

* commit '57641a8b5080b5122fcdd98c56fffaef90b3992d':
  Added a check if a custom activity can be started
2015-01-29 18:12:42 +00:00
Fyodor Kupolov
2f3bc3cb3f am e3904c4f: am e8e7b9b3: Added a check if a custom activity can be started
* commit 'e3904c4f09b1a828e2d1f2f3536cdc8eca84a6aa':
  Added a check if a custom activity can be started
2015-01-29 18:12:04 +00:00
Fyodor Kupolov
0d5ad3b73e am 57641a8b: am d7e93570: am f11f9f47: Added a check if a custom activity can be started
* commit '57641a8b5080b5122fcdd98c56fffaef90b3992d':
  Added a check if a custom activity can be started
2015-01-29 18:09:29 +00:00
Fyodor Kupolov
57641a8b50 am d7e93570: am f11f9f47: Added a check if a custom activity can be started
* commit 'd7e93570d35cfec4e5de0f3edc5d326ecdb8a442':
  Added a check if a custom activity can be started
2015-01-29 18:02:40 +00:00
Fyodor Kupolov
e3904c4f09 am e8e7b9b3: Added a check if a custom activity can be started
* commit 'e8e7b9b3811b3295454298b02f136adf0527d1da':
  Added a check if a custom activity can be started
2015-01-29 18:01:00 +00:00
Fyodor Kupolov
d7e93570d3 am f11f9f47: Added a check if a custom activity can be started
* commit 'f11f9f47d3cfb5d1b9e7da1705252e75913410f1':
  Added a check if a custom activity can be started
2015-01-29 17:55:47 +00:00
Fyodor Kupolov
f11f9f47d3 Added a check if a custom activity can be started
AppRestrictionsFragment starts an activity using an intent provided by the
receiver. A check was added to prevent an app from starting an activity that
it does not own.

Bug: 14441412
Change-Id: Ia6820b1daf3783d605b92976c78cb522b17dc8f2
(cherry picked from commit 07ab95c43e)
2015-01-28 10:31:36 +00:00
Fyodor Kupolov
e8e7b9b381 Added a check if a custom activity can be started
AppRestrictionsFragment starts an activity using an intent provided by the
receiver. A check was added to prevent an app from starting an activity that
it does not own.

Bug: 14441412
Change-Id: Ia6820b1daf3783d605b92976c78cb522b17dc8f2
2015-01-28 05:23:07 -05:00
Paul Crowley
8fca3fcc06 Prevent factory reset for short passwords in CryptKeeper
Since patterns and passwords can't be shorter than 4
elements, we shouldn't count them against attempts to unlock
the device.  If we do, we risk resetting the device
due to stray input.

Bug: 18211475
Bug: 18273380

Change-Id: Ib329cd3383471483cda68bfac4278b17d0c09c57

Conflicts:
	src/com/android/settings/CryptKeeper.java

Conflicts:
	src/com/android/settings/CryptKeeper.java
2014-11-19 12:00:32 +00:00
Michael Wright
f7a5017fa6 Skip Misc/Overcounted battery stats in release builds.
Bug: 18090734
Change-Id: I24d8eea9fcb0d0b9e50d512325ed91ce70eb16ac
2014-10-24 14:25:49 -07:00
Baligh Uddin
8d7fdc618a Import translations. DO NOT MERGE
Change-Id: I9e17d1cbaab06ef2e48001b946476e99d70ba195
Auto-generated-cl: translation import
2014-10-23 14:37:38 -07:00
Amith Yamasani
c1dc875224 Merge "Disable factory reset for secondary users" into lmp-dev 2014-10-22 23:59:19 +00:00
Amith Yamasani
4339a470d3 Disable factory reset for secondary users
Search in Settings makes it possible to find the factory reset screen.
Disable the search index in PrivacySettings so that backup and reset
keywords don't get indexed for secondary users.
Also add additional safeguards for other entry points such as public
intents, so that the backup/reset screen does not show any options.

Bug: 18076086
Change-Id: Ie5135fbf4084038c99947a1a107ab4758f0c15a9
2014-10-22 13:51:53 -07:00
Paul Jensen
d9b8d1803a Merge "Launch browser directly when user selects "Mobile Plan"." into lmp-dev 2014-10-22 17:17:00 +00:00
Geoff Mendal
795c837807 Import translations. DO NOT MERGE
Change-Id: I80fabd3e1f2306d6b9be8973c70aaf5438e58c51
Auto-generated-cl: translation import
2014-10-20 16:33:09 -07:00
Baligh Uddin
25149b3895 Import translations. DO NOT MERGE
Change-Id: I3435cc63d25394c2b14089857e36de92c9a2b673
Auto-generated-cl: translation import
2014-10-19 10:10:53 -07:00
Paul Jensen
d96c5fc70a Launch browser directly when user selects "Mobile Plan".
Previously this used to send a broadcast to ConnectivityService
which would in turn launch the web browser.  The ConnectivityService
code has since been removed, so just launch the browser directly.

bug:17472930
Change-Id: I5d419348efbb56b6c3c0fdbb8663efd0cfb2dde9
2014-10-18 15:33:33 -04:00
Jim Miller
aa03767598 Fix bad string in EncryptionInterstitial
The string contains "Talkback", but it should grab one of
the installed Accessibility services so it works on 3rd party
devices.

Fixes bug 17881324

Change-Id: Iee2d8d4ce93c851badc59b5ef21462213f530a96
2014-10-17 18:28:52 -07:00
Jim Miller
47adff0a8b Show warning dialog when Accessibility is enabled
This shows a warning dialog in EncryptionInterstitial when the
user selects "Require password".

Fixes bug 17881324

Change-Id: Id9336f1f14d38f169205cc72cc42be8de94fae71
2014-10-17 17:43:18 -07:00
Jim Miller
602d559d9c Merge "Several fixes to new EncryptionInterstitial dialog." into lmp-dev 2014-10-17 23:48:35 +00:00
Jim Miller
0698a21631 Several fixes to new EncryptionInterstitial dialog.
The code now observes whether accessibility is turned on when
deciding the default state.

Additionally, it fixes a bug where the user can back out of
EncryptionInterstitial and leave the setting in a bad state.
We now propagate the state until the place where it ultimately
gets stored.

Also fixes problem where Encryption was ignoring the state
where the device was already encrypted.

Fixes bug 17881324

Change-Id: Iec09e4464832a506bb2a78bb14a38b3531971fa0
2014-10-17 16:11:59 -07:00
Svetoslav
ba202e9fb2 Merge "Accessibility no longer overrides strong encryption (Settings)." into lmp-dev 2014-10-17 22:59:43 +00:00
Svetoslav
40ca78f6f3 Accessibility no longer overrides strong encryption (Settings).
Updating the accessibility layer behavior to reflect the new
model where accessibility no longer overrides strong encryption.
Now enabling an accessibility service lowers the encryption
level but the user can bump it up in settings if desired.

bug:17881324

Change-Id: Iaf46cbabf1c19c193ea39b35add27aaa4ff509e4
2014-10-17 14:41:58 -07:00