Commit Graph

18003 Commits

Author SHA1 Message Date
Beverly Tai
d54bc6a908 Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into mnc-dr-dev am: 8150eb82ee
am: 97b98a3b1c

Change-Id: If39d33d4c5b9e1057c7cdfd9b9b52f42d4b193d2
2017-09-14 14:29:56 +00:00
Beverly Tai
97b98a3b1c Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into mnc-dr-dev
am: 8150eb82ee

Change-Id: I85a98e8c857c9c7b7597fafb13ecb6ae44cb9b69
2017-09-14 14:25:02 +00:00
Beverly
fafea6ab91 DO NOT MERGE Backporting potential usb tapjacking precaution.
Bug: 62187985
Test: manual, backport
Change-Id: Ic7a81cf130fc70bc18f6990a662e921eb0d22635
2017-09-12 15:01:07 +00:00
Tony Mak
569af6584a [automerger] Enforce policy for camera gesture in keyguard am: 65f02e8ba7 am: 6acee639af
Change-Id: I877b0cba326b85e894d52f24a694a1ef666cdb1c
2017-08-11 21:09:58 +00:00
Tony Mak
6acee639af [automerger] Enforce policy for camera gesture in keyguard am: 65f02e8ba7
Change-Id: Ia91fe8b88c04f1b430f8cf90f5691b6b2791610b
2017-08-11 21:09:21 +00:00
Tony Mak
65f02e8ba7 Enforce policy for camera gesture in keyguard
Test:
1. Set lock screen, set keyguard policy. Lock the device.
   Observe that double tap is not showing camera

2. Set lock screen, unset the keyguard policy. Lock the device.
   Observe that double tap is showing camera

3. Unset lock screen (swipe), set the keyguard policy. Lock the device.
   Observe that double tap is showing camera.

4. Unset lock screen (swipe), unset the keyguard policy. Lock the device.
   Observe that double tap is showing camera.

Bug: 63787722
Merged-In: I104688eaad719528376e2851f837d5956a6a1169

Change-Id: I42e6d9015682998176fe41971356bde22e1b37b2
2017-07-28 15:25:29 +01:00
Jeff Sharkey
59bb608433 Public volumes belong to a single user. am: 3a062a67fa
am: e80720a731

Change-Id: I2ccf22ad13ff106b1ee3c750258917dee6c6f631
2016-11-07 23:46:19 +00:00
Jeff Sharkey
e80720a731 Public volumes belong to a single user.
am: 3a062a67fa

Change-Id: Ibe40a7985bde6ff6d8bc307c28b94f7b1445c961
2016-11-07 23:35:34 +00:00
Jeff Sharkey
def2123f56 Public volumes belong to a single user.
When a public (vfat) device is inserted, it's strongly associated
with the current foreground user, and no other users should be able
to access it, since otherwise that would be a cross-user data leak.

To use the device under a different user, switch users and then
eject/remount the device.

Test: verified user isolation of USB drive
Bug: 32523490
Change-Id: I590c791996f1fea8d78f625dc942d149f1f41614
2016-11-02 22:07:11 +00:00
Jeff Sharkey
3a062a67fa Public volumes belong to a single user.
When a public (vfat) device is inserted, it's strongly associated
with the current foreground user, and no other users should be able
to access it, since otherwise that would be a cross-user data leak.

To use the device under a different user, switch users and then
eject/remount the device.

Test: verified user isolation of USB drive
Bug: 32523490
Change-Id: I590c791996f1fea8d78f625dc942d149f1f41614
2016-11-02 16:04:38 -06:00
Jim Miller
85c390e9fb Bind fingerprint when we start authentication - DO NOT MERGE am: b6f4b48df2
am: 9f04985991

Change-Id: Iff24a78b5a4b4de9b866105fbce2a181125b771e
2016-08-19 20:16:34 +00:00
Jim Miller
9f04985991 Bind fingerprint when we start authentication - DO NOT MERGE
am: b6f4b48df2

Change-Id: Ib70a6f9f82eef19724f6dd83fdefec59a29d0cab
2016-08-19 20:09:41 +00:00
Jim Miller
b6f4b48df2 Bind fingerprint when we start authentication - DO NOT MERGE
This fixes a bug where it was possible to authenticate the wrong user.
We now bind the userId when we start authentication and confirm it when
authentication completes.

Fixes bug 30744668

Change-Id: I346d92c301414ed81e11fa9c171584c7ae4341c2
2016-08-19 03:46:40 +00:00
Sudheer Shanka
63e8198685 Merge \\\"Reduce shell power over user management.\\\" into mnc-dev am: 964500fd43 am: 9bfa0ad22f
am: fb87ae59b0

Change-Id: I4e517e522896242fb9b23b21c217c6fd876ef8b7
2016-06-21 22:25:19 +00:00
Sudheer Shanka
fb87ae59b0 Merge \\"Reduce shell power over user management.\\" into mnc-dev am: 964500fd43
am: 9bfa0ad22f

Change-Id: I952f6a12be0c1edc6027ccce785d47d7f84757ef
2016-06-21 22:19:05 +00:00
Sudheer Shanka
9bfa0ad22f Merge \"Reduce shell power over user management.\" into mnc-dev
am: 964500fd43

Change-Id: I3531a208b4e2bd603bde2afcbee9589bf2f712d9
2016-06-21 22:11:44 +00:00
Sudheer Shanka
964500fd43 Merge "Reduce shell power over user management." into mnc-dev 2016-06-21 22:03:05 +00:00
Hall Liu
edace5e820 Merge \\\"DO NOT MERGE Disable app pinning when emergency call button pressed\\\" into mnc-dev am: fc32ec1aef am: aeba34533c
am: 317d0cb169

Change-Id: I9fb47597393f5b1267ec37a05cd9aa34eebebd23
2016-06-20 21:28:09 +00:00
Hall Liu
317d0cb169 Merge \\"DO NOT MERGE Disable app pinning when emergency call button pressed\\" into mnc-dev am: fc32ec1aef
am: aeba34533c

Change-Id: Id2da5c1dcf1477c5ee71e1ecb25ccfbc92aed7bc
2016-06-20 21:21:25 +00:00
Hall Liu
aeba34533c Merge \"DO NOT MERGE Disable app pinning when emergency call button pressed\" into mnc-dev
am: fc32ec1aef

Change-Id: I04ff0004a9112cfbe7e61b2fa6cb3fd4f037bbd0
2016-06-20 21:15:42 +00:00
Sudheer Shanka
cd50529e6f Reduce shell power over user management.
Remove MANAGE_USERS permission from shell and whitelist it for
some specific functionality.

Bug: 29189712
Change-Id: Ifb37448c091af91991964511e3efb1bb4dea1ff3
2016-06-16 10:17:02 -07:00
Hall Liu
209414015c DO NOT MERGE Disable app pinning when emergency call button pressed
Also disables app pinning when the "return to call" button is pressed
and brings up the in-call screen when app pinning is stopped if there is
an existing call.

Combination of ag/1091397 and ag/1085584 adapted for MNC.

Bug: 28558307
Bug: 28761672
Change-Id: I82ec4042bff387c845ce571b197a4a86e1dd5ec8
2016-06-02 12:58:01 -07:00
Mitchell Wills
2dbac6cee5 Update scan and last network info in the WorkThread am: cf0875a
am: c441faa

* commit 'c441faa6de5618e9da029858ce83b3e129be2974':
  Update scan and last network info in the WorkThread

Change-Id: I69ee081eb91a521e7c6cdc7ca6e96ebc230c1aba
2016-04-20 18:57:29 +00:00
Mitchell Wills
c441faa6de Update scan and last network info in the WorkThread
am: cf0875a

* commit 'cf0875a9b69da9da5e16563eca33609e775d9195':
  Update scan and last network info in the WorkThread

Change-Id: I0b59f1eaa9bad27b300477f31fb88fb8e2eacb38
2016-04-20 18:53:58 +00:00
Mitchell Wills
cf0875a9b6 Update scan and last network info in the WorkThread
This prevents a race condition where mLastInfo is updated while
processing scan results causing a crash.

Change-Id: Ic5147f3851f218c0f697e4ebb324f1cb63d02665
Fixes: 27944510
2016-04-20 10:34:24 -07:00
Akshay Thakker
d6de840957 Merge "Fix missing observer reply callbacks" into mnc-dr-dev am: d1811e07d5
am: a3798d7a92

* commit 'a3798d7a92ecefe1117b99a2e0f5edce1644f1d0':
  Fix missing observer reply callbacks
2016-02-14 22:37:55 +00:00
Akshay Thakker
a3798d7a92 Merge "Fix missing observer reply callbacks" into mnc-dr-dev
am: d1811e07d5

* commit 'd1811e07d5ee751cbdc37a3ff84e2e010ead7adf':
  Fix missing observer reply callbacks
2016-02-14 22:30:47 +00:00
Dan Sandler
4baa901205 DO NOT MERGE: Use GregorianCalendar.add() when searching for next alarm.
am: e79c73d626

* commit 'e79c73d6267681dbbc8bd4eccf9a79e3017f6fe9':
  DO NOT MERGE: Use GregorianCalendar.add() when searching for next alarm.
2016-02-14 22:25:09 +00:00
Akshay Thakker
d1811e07d5 Merge "Fix missing observer reply callbacks" into mnc-dr-dev 2016-02-14 22:23:54 +00:00
Amith Yamasani
dbb75248b1 Fix missing observer reply callbacks
This was causing upto 2 seconds in user switching delay.

Bug: 25813588
Change-Id: Icf23b021f134a8ccfa2dae470af02b2da7454acc
2016-02-12 18:13:00 -08:00
Dan Sandler
e79c73d626 DO NOT MERGE: Use GregorianCalendar.add() when searching for next alarm.
Never attribute to malice that which is adequately explained
by a bug, particularly one involving date math.

Bug: 26326394
Change-Id: I3483ac102c678a8852565c8ea94c06e19b3f26d8
(cherry picked from commit 8d9aea8a18)
2016-02-12 20:21:23 +00:00
Geoff Mendal
c0297abd93 Merge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev 2016-02-02 21:40:54 +00:00
Geoff Mendal
09f11126a4 Import translations. DO NOT MERGE
Change-Id: I9f019cebdea7b7e4b3600f936e7913cbeffc5a63
Auto-generated-cl: translation import
2016-02-02 13:40:03 -08:00
Geoff Mendal
4a27667bf5 Merge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev 2016-02-02 21:28:40 +00:00
Geoff Mendal
091513d6e8 Merge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev 2016-02-02 21:28:20 +00:00
Geoff Mendal
063357312c Merge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev 2016-02-02 21:27:36 +00:00
Geoff Mendal
3122eedcd3 Merge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev 2016-02-02 21:27:10 +00:00
Geoff Mendal
b697973e2a Merge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev 2016-02-02 21:26:55 +00:00
Geoff Mendal
21e0a012d8 Merge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev 2016-02-02 21:26:38 +00:00
Geoff Mendal
497300badb Merge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev 2016-02-02 21:26:16 +00:00
Geoff Mendal
9561ec3353 Merge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev 2016-02-02 21:26:02 +00:00
Geoff Mendal
6f63adbe93 Merge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev 2016-02-02 21:25:44 +00:00
Geoff Mendal
1f1efac8bd Import translations. DO NOT MERGE
Change-Id: I6cd7603e8c73642eaa89a1aa5dd6250bf74d5342
Auto-generated-cl: translation import
2016-02-02 13:21:58 -08:00
Geoff Mendal
e661696a56 Import translations. DO NOT MERGE
Change-Id: I9e8858c1ec9732e1e9f9a9a7cb212a958629fc2e
Auto-generated-cl: translation import
2016-02-02 13:18:46 -08:00
Geoff Mendal
bf8af9dde6 Import translations. DO NOT MERGE
Change-Id: I522dbce84a7dad42bb0159d365fe3f2049679207
Auto-generated-cl: translation import
2016-02-02 13:06:29 -08:00
Geoff Mendal
7a8788ec00 Import translations. DO NOT MERGE
Change-Id: Ieaafa87030d49b1db501a2837e152e7bf3450c22
Auto-generated-cl: translation import
2016-02-02 13:03:26 -08:00
Geoff Mendal
95b8d3a6b3 Import translations. DO NOT MERGE
Change-Id: I3811fe74ac702597cf4ba9db60bc035f28632b28
Auto-generated-cl: translation import
2016-02-02 13:00:39 -08:00
Geoff Mendal
3ffab58eb4 Import translations. DO NOT MERGE
Change-Id: Iea8b528da87c3a0e12d2f0d782334390b1876a2b
Auto-generated-cl: translation import
2016-02-02 12:57:33 -08:00
Geoff Mendal
c265968b99 Import translations. DO NOT MERGE
Change-Id: I8278f026b87460de08b62ea54c36b024eb4f49f8
Auto-generated-cl: translation import
2016-02-02 12:54:05 -08:00
Geoff Mendal
3553bebd40 Import translations. DO NOT MERGE
Change-Id: I011c83fb945b04260dd0564f22874dd3eab57047
Auto-generated-cl: translation import
2016-02-02 12:50:58 -08:00