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
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
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
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
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
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
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
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
73ecaf0881
Import translations. DO NOT MERGE
...
Change-Id: I25920d1a09b527c9e2868537f68d994a40a85e6a
Auto-generated-cl: translation import
2016-02-01 13:24:23 -08:00
Geoff Mendal
f544fc21d0
Import translations. DO NOT MERGE
...
Change-Id: Ic5942cf8f289103e9a78b93e69211bf17a47b344
Auto-generated-cl: translation import
2016-02-01 12:37:44 -08:00
Bryce Lee
cf91b45c05
Merge "Add setting for declaring disabled bluetooth profiles." into cw-e-dev
2015-12-17 19:40:47 +00:00
Bryce Lee
ec85f34812
Add setting for declaring disabled bluetooth profiles.
...
Bug: 25900899
Change-Id: I420a7c590d72ba10f3e466d15dccfdbb520e810a
2015-12-16 13:32:28 -08:00
Geoff Mendal
d0dd157ade
Merge "Import translations. DO NOT MERGE" into cw-e-dev
2015-12-16 05:05:18 +00:00
Geoff Mendal
8f316d2723
Import translations. DO NOT MERGE
...
Change-Id: Ia8ab8097f7b82ed5fb344351035535c5b3b0690d
Auto-generated-cl: translation import
2015-12-15 21:03:50 -08:00
Geoff Mendal
8b4b230174
Merge "Import translations. DO NOT MERGE" into cw-e-dev
2015-12-16 05:02:26 +00:00
Geoff Mendal
1144462f6b
Import translations. DO NOT MERGE
...
Change-Id: Ifbe7e97f2a1fe1b688642a8179c0e184d69ba3cb
Auto-generated-cl: translation import
2015-12-15 21:00:49 -08:00
Geoff Mendal
10bc1c7000
Merge "Import translations. DO NOT MERGE" into cw-e-dev
2015-12-16 04:49:00 +00:00
Geoff Mendal
e0b74266f7
Import translations. DO NOT MERGE
...
Change-Id: Idc7e685457dc0bc2da4df2bd10ac2187d64fa00f
Auto-generated-cl: translation import
2015-12-15 20:45:33 -08:00
Geoff Mendal
df5dd062a0
Merge "Import translations. DO NOT MERGE" into cw-e-dev
2015-12-16 04:36:13 +00:00
Geoff Mendal
648fa53981
Import translations. DO NOT MERGE
...
Change-Id: Ic3c47d16450ddb80c815369cf01bb63be1f73a88
Auto-generated-cl: translation import
2015-12-15 20:34:53 -08:00
Geoff Mendal
531eb5b484
Merge "Import translations. DO NOT MERGE" into cw-e-dev
2015-12-16 04:34:26 +00:00
Geoff Mendal
d2615bdf40
Import translations. DO NOT MERGE
...
Change-Id: Ie93a6af2b483228b5797bdb018ac8accc7ef54ed
Auto-generated-cl: translation import
2015-12-15 20:29:48 -08:00
Geoff Mendal
695cf968b7
Import translations. DO NOT MERGE
...
Change-Id: I28f308a8339779f14ccf90581665624317afb4d3
Auto-generated-cl: translation import
2015-12-15 20:21:26 -08:00
Geoff Mendal
bddde9b83d
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Change-Id: I0ab6836c1cf116a76b9ece6722e2f3dfe2d4bfe2
2015-11-20 01:07:33 +00:00
Sanket Padawe
abea6dc466
Merge "Don't allow contact sharing by default for device not recognized as carkit." into mnc-dev
2015-11-17 01:07:28 +00:00
Winson Chung
1b29fd87a2
Merge "DO NOT MERGE Ensure that the device is provisioned before showing Recents." into mnc-dev am: dce0f8040d
...
am: 3e9f2b7894
* commit '3e9f2b789414f34b5530107c362295c5a637bac1':
DO NOT MERGE Ensure that the device is provisioned before showing Recents.
2015-11-13 18:15:29 +00:00
Winson Chung
3e9f2b7894
Merge "DO NOT MERGE Ensure that the device is provisioned before showing Recents." into mnc-dev
...
am: dce0f8040d
* commit 'dce0f8040dcce494166832eb6c1e8a2d9638ddd4':
DO NOT MERGE Ensure that the device is provisioned before showing Recents.
2015-11-13 18:08:35 +00:00
Sanket Padawe
4f822bbf2a
Merge "Don\'t allow contact sharing by default for device not recognized as carkit." into mnc-dr-dev
...
am: 5b6ad87630
* commit '5b6ad87630756751471f7224672328d955c8f2fb':
Don't allow contact sharing by default for device not recognized as carkit.
2015-11-12 23:58:48 +00:00
Sanket Padawe
ccbe7383e6
Don't allow contact sharing by default for device not recognized as carkit.
...
+ Don't allow contact sharing by default for devices not recognized
as carkit at pair time.
Bug: 23607427
Change-Id: If6babb10117ba7ee5008a4a29450a7cb981bea4a
(cherry picked from commit 07533dbfff )
2015-11-12 23:53:42 +00:00
Sanket Padawe
07533dbfff
Don't allow contact sharing by default for device not recognized as carkit.
...
+ Don't allow contact sharing by default for devices not recognized
as carkit at pair time.
Bug: 23607427
Change-Id: If6babb10117ba7ee5008a4a29450a7cb981bea4a
2015-11-11 15:01:35 -08:00
Winson
a7df77155d
DO NOT MERGE Ensure that the device is provisioned before showing Recents.
...
Bug: 25476219
Change-Id: Ibbe621748f7275f8c1ccded84612ca16292559eb
2015-11-11 17:48:34 +00:00
Jeff Sharkey
e6538dcc06
Merge "Block directory selection in openable modes." into mnc-dr-dev
...
am: 00765ef5a2
* commit '00765ef5a2a0981d18a15f3acaf4119592d42996':
Block directory selection in openable modes.
2015-11-09 21:46:06 +00:00
Geoff Mendal
210f0afaf9
Import translations. DO NOT MERGE
...
Change-Id: I45eaf276af6efa775e2e7c0a7cd8040fbf13e32e
Auto-generated-cl: translation import
2015-11-09 05:11:08 -08:00
Jeff Sharkey
7ecaea83d4
Block directory selection in openable modes.
...
When picking documents to return to apps requesting CATEGORY_OPENABLE
we can't let the user select directories.
Bug: 25455200
Change-Id: I8076883ee5b019eab4d2adb841952865f21e413e
2015-11-06 09:16:22 -08:00
Geoff Mendal
4c9cdbc7ba
Import translations. DO NOT MERGE
...
Change-Id: I4d14bf278e491e46eeaabd4bb97641d06c48920c
Auto-generated-cl: translation import
2015-11-04 06:59:32 -08:00