Nick Kralevich
8a85dcc9b4
am 1adca55f
: Merge "UsbModeChooserActivity: Ensure MIDI available with DISALLOW_USB_FILE_TRANSFER" into mnc-dev
...
* commit '1adca55ffe10f1741e5fb75bf0e7530ca200d712':
UsbModeChooserActivity: Ensure MIDI available with DISALLOW_USB_FILE_TRANSFER
2015-08-04 19:52:44 +00:00
Nick Kralevich
1adca55ffe
Merge "UsbModeChooserActivity: Ensure MIDI available with DISALLOW_USB_FILE_TRANSFER" into mnc-dev
2015-08-04 19:45:58 +00:00
Jason Monk
c5291b87b3
Remove summaries fro configure apps page
...
Bug: 22741399
Change-Id: Iead63e39eafdc9217a4e569b3b7b4e71f401e85e
2015-08-04 15:25:32 -04:00
Jason Monk
5d402d59bc
am 9390333c
: am d2af0859
: am 661d1b77
: am 2e3775b9
: Merge "Update USB dialog for USB-C power option" into mnc-dr-dev
...
* commit '9390333c84c6218cf70d0750c3f351ff208005f6':
Update USB dialog for USB-C power option
2015-08-04 18:23:57 +00:00
Jason Monk
9390333c84
am d2af0859
: am 661d1b77
: am 2e3775b9
: Merge "Update USB dialog for USB-C power option" into mnc-dr-dev
...
* commit 'd2af08595073f92eb54d6c08f6d896309b5270d9':
Update USB dialog for USB-C power option
2015-08-04 18:14:38 +00:00
Jason Monk
661d1b7788
am 2e3775b9
: Merge "Update USB dialog for USB-C power option" into mnc-dr-dev
...
* commit '2e3775b9b143311da66b91c6f1291a4639236d07':
Update USB dialog for USB-C power option
2015-08-04 17:57:14 +00:00
Jason Monk
2e3775b9b1
Merge "Update USB dialog for USB-C power option" into mnc-dr-dev
2015-08-04 17:44:00 +00:00
Jason Monk
d30e426976
Add setting to disable camera gesture
...
Bug: 22183841
Change-Id: I6ada3d2c911fd52e2821f12f3db5d549879941f4
2015-08-04 11:30:50 -04:00
Jason Monk
4137396ac3
am a4152146
: am 92f7b48e
: am 7bed7f04
: am 3daefe4c
: am f61ead7a
: Make sure accessibility service desc isn\'t clickable
...
* commit 'a41521465e88a2c29d6e41b735ed4593c3531c8c':
Make sure accessibility service desc isn't clickable
2015-08-04 14:26:43 +00:00
Jason Monk
a41521465e
am 92f7b48e
: am 7bed7f04
: am 3daefe4c
: am f61ead7a
: Make sure accessibility service desc isn\'t clickable
...
* commit '92f7b48eb78dd4723cf3d65c163da9498e7ad936':
Make sure accessibility service desc isn't clickable
2015-08-04 14:20:41 +00:00
Jason Monk
7bed7f0443
am 3daefe4c
: am f61ead7a
: Make sure accessibility service desc isn\'t clickable
...
* commit '3daefe4c94fc2f411f100ba2488322fe9885d362':
Make sure accessibility service desc isn't clickable
2015-08-04 14:04:19 +00:00
Jason Monk
25adfb004d
am f61ead7a
: Make sure accessibility service desc isn\'t clickable
...
* commit 'f61ead7ad619a9933b6d87f0ddf4506d05253ee1':
Make sure accessibility service desc isn't clickable
2015-08-04 13:55:14 +00:00
Jason Monk
f61ead7ad6
Make sure accessibility service desc isn't clickable
...
Bug: 21644974
Change-Id: Ic645a78382c5c8343b22254ce4844068735efce9
2015-08-04 09:44:10 -04:00
Jason Monk
83290eef8c
Update USB dialog for USB-C power option
...
Also includes a bit of visual updates, options now have summaries
as well.
Code has been refactored a bit, and is more flexible to easily
support any kind of power/data flow combination once its time
to support that.
Currently devices don't have USB-C ports, they can be simulated
with the following commands:
$ adb shell dumpsys usb add-port "matrix" dual
# ?s control whether these can be changed
$ adb shell dumpsys usb connect-port "matrix" ufp? sink? device?
# Do testing here
$ adb shell dumpsys usb disconnect-port "matrix"
$ adb shell dumpsys usb remove-port "matrix"
$ adb shell dumpsys usb reset
# Use the help for more info
$ adb shell dumpsys usb -h
Bug: 21615151
Change-Id: I53ad4de51ff10a197c87bf2741756c1821ee9e74
2015-08-04 09:18:57 -04:00
Dianne Hackborn
a3903ad006
am bd3119cc
: am 437c0d25
: am a180141e
: am e86b170d
: am f426126a
: Merge "Fix issue #22860466 : viapi security bug - rubber stamping in nested VIs" into mnc-dev
...
* commit 'bd3119ccb443a53362cb5325854aa2392b0c043e':
Fix issue #22860466 : viapi security bug - rubber stamping in nested VIs
2015-08-04 04:55:10 +00:00
Chris Tate
57c4ddcb15
am 1cc416b8
: am deb879cc
: am e09bfe34
: am bd3d49f7
: am 6e64e22e
: Merge "Explain properly when apps can open multiple hosts\' links" into mnc-dev
...
* commit '1cc416b8a4bf64d13a07a69a263e6d41f84f3f80':
Explain properly when apps can open multiple hosts' links
2015-08-04 04:55:09 +00:00
Dianne Hackborn
50cb6411fa
am f426126a
: Merge "Fix issue #22860466 : viapi security bug - rubber stamping in nested VIs" into mnc-dev
...
* commit 'f426126a76745451893b8b9e131dea61e6fb9e63':
Fix issue #22860466 : viapi security bug - rubber stamping in nested VIs
2015-08-04 03:10:35 +00:00
Chris Tate
5977cfdf91
am 6e64e22e
: Merge "Explain properly when apps can open multiple hosts\' links" into mnc-dev
...
* commit '6e64e22ec72ac3adfb530f57925e1d4fe1c332dc':
Explain properly when apps can open multiple hosts' links
2015-08-04 03:10:34 +00:00
Prem Kumar
0694de9397
am eed361bb
: Merge "Allow Contact sharing by default while connecting Car Kit." into mnc-dev
...
* commit 'eed361bbafc079adb2a33eccee2f0a71d872ad54':
Allow Contact sharing by default while connecting Car Kit.
2015-08-04 03:10:26 +00:00
Maurice Lam
01495108f1
am 87fadbe6
: [Fingerprint] Help text for backup screen lock
...
* commit '87fadbe6d96e482fa8fc94f502afa10a522285a4':
[Fingerprint] Help text for backup screen lock
2015-08-04 03:10:07 +00:00
Dianne Hackborn
bd3119ccb4
am 437c0d25
: am a180141e
: am e86b170d
: am f426126a
: Merge "Fix issue #22860466 : viapi security bug - rubber stamping in nested VIs" into mnc-dev
...
* commit '437c0d2547b089f413a04a0e414ff7cf6c251def':
Fix issue #22860466 : viapi security bug - rubber stamping in nested VIs
2015-08-04 01:37:50 +00:00
Chris Tate
1cc416b8a4
am deb879cc
: am e09bfe34
: am bd3d49f7
: am 6e64e22e
: Merge "Explain properly when apps can open multiple hosts\' links" into mnc-dev
...
* commit 'deb879cc5bccb0bad7d49595db9b704520c621ac':
Explain properly when apps can open multiple hosts' links
2015-08-04 01:37:49 +00:00
Prem Kumar
cba797450c
am 881207b0
: am a2ef9256
: am 21adfeeb
: am b0d10e79
: am eed361bb
: Merge "Allow Contact sharing by default while connecting Car Kit." into mnc-dev
...
* commit '881207b035a47fe5c698b4a99e28325ffa787f74':
Allow Contact sharing by default while connecting Car Kit.
2015-08-04 01:33:19 +00:00
Maurice Lam
24628cbfeb
am ce08d4d3
: am 36d6d2ff
: am 4c55266b
: am 0d6e1da5
: am 87fadbe6
: [Fingerprint] Help text for backup screen lock
...
* commit 'ce08d4d30811e251a2437f13ecb6bdfc00e179c4':
[Fingerprint] Help text for backup screen lock
2015-08-04 01:33:18 +00:00
Prem Kumar
881207b035
am a2ef9256
: am 21adfeeb
: am b0d10e79
: am eed361bb
: Merge "Allow Contact sharing by default while connecting Car Kit." into mnc-dev
...
* commit 'a2ef9256a102b9610118aede3b5142c8fe047f88':
Allow Contact sharing by default while connecting Car Kit.
2015-08-04 01:23:46 +00:00
Maurice Lam
ce08d4d308
am 36d6d2ff
: am 4c55266b
: am 0d6e1da5
: am 87fadbe6
: [Fingerprint] Help text for backup screen lock
...
* commit '36d6d2ff08d5e9bd9ecaa176f6ebea99c7f7db6f':
[Fingerprint] Help text for backup screen lock
2015-08-04 01:23:45 +00:00
Dianne Hackborn
a180141e32
am e86b170d
: am f426126a
: Merge "Fix issue #22860466 : viapi security bug - rubber stamping in nested VIs" into mnc-dev
...
* commit 'e86b170d7faf32d0677122c7273545a0144cc438':
Fix issue #22860466 : viapi security bug - rubber stamping in nested VIs
2015-08-04 01:19:52 +00:00
Chris Tate
e09bfe34d9
am bd3d49f7
: am 6e64e22e
: Merge "Explain properly when apps can open multiple hosts\' links" into mnc-dev
...
* commit 'bd3d49f78712b12db99ef316e8ec42eb94ea0f06':
Explain properly when apps can open multiple hosts' links
2015-08-04 01:15:39 +00:00
Prem Kumar
21adfeebc2
am b0d10e79
: am eed361bb
: Merge "Allow Contact sharing by default while connecting Car Kit." into mnc-dev
...
* commit 'b0d10e796f1de43c6db2dba5315d21362a26cbfc':
Allow Contact sharing by default while connecting Car Kit.
2015-08-04 01:08:49 +00:00
Maurice Lam
4c55266b16
am 0d6e1da5
: am 87fadbe6
: [Fingerprint] Help text for backup screen lock
...
* commit '0d6e1da536e99ad9e141812295e67727f78475f6':
[Fingerprint] Help text for backup screen lock
2015-08-04 01:08:48 +00:00
Dianne Hackborn
f426126a76
Merge "Fix issue #22860466 : viapi security bug - rubber stamping in nested VIs" into mnc-dev
2015-08-04 01:07:36 +00:00
Chris Tate
6e64e22ec7
Merge "Explain properly when apps can open multiple hosts' links" into mnc-dev
2015-08-04 00:56:24 +00:00
Christopher Tate
d485c6b13d
Explain properly when apps can open multiple hosts' links
...
The app link settings "Open by default" detail view was showing
only one host under label "Supported links," improperly implying
that the app would only open that host's links. The summary now
matches the 'App links' view's, explaining "Open $HOST and related
URLs" for apps with more than one.
Tapping on the item has always shown the full list of hosts
advertised by the app, and this remains unchanged.
Bug 22769535
Change-Id: I2be409df64639eb0f2b43a06e3195796c3a3df8b
2015-08-03 17:46:30 -07:00
Prem Kumar
eed361bbaf
Merge "Allow Contact sharing by default while connecting Car Kit." into mnc-dev
2015-08-04 00:41:47 +00:00
Dianne Hackborn
2dbeb423a9
Fix issue #22860466 : viapi security bug - rubber stamping in nested VIs
...
The settings activities that get launched directly by voice now
protect themselves to only execute if they were actually directly
launched by the voice interaction service, rather than allowing
any activity currently under voice control to abuse them.
Note the original code also allowed them to execute regardless of
whether they were running under voice, since it allowed for a null
saved state. I assume that was a mistake, so have removed it.
Change-Id: Ib2269a7ee13016d300afba7fa257bfaca8990fab
2015-08-03 17:17:10 -07:00
Maurice Lam
87fadbe6d9
[Fingerprint] Help text for backup screen lock
...
Show a help text saying "Choose your backup screen lock method" when
asking the user for backup screen lock during fingerprint enrollment.
A backup translation is specified, using the source string "Set up your
backup screen lock method".
Bug: 22879473
Change-Id: I9b9348141227103e695d1fc78601745cac0309a7
2015-08-03 23:12:09 +00:00
Vinit Deshpande
6d85bcb3ed
am bce70a1f
: am 2fbcdd34
: am 5bfa8d8a
: am 5acb871c
: am b74c0b2a
: Merge "wifi: Check for the sizeof ssid to start SoftAP" into mnc-dev
...
* commit 'bce70a1f9b852c857e1820d22324f60ac60862db':
wifi: Check for the sizeof ssid to start SoftAP
2015-08-01 17:52:37 +00:00
Jim Miller
1d836ef864
am 8ea975c1
: am bb89abea
: am d0c09c48
: am 0a8b6f2b
: am efaa19d9
: Fix fingerprint enrolling bug.
...
* commit '8ea975c12857724c73e7eed98f91d53fbf606140':
Fix fingerprint enrolling bug.
2015-08-01 17:52:35 +00:00
Maurice Lam
b4be753011
am de4a5362
: am e39a99e1
: am 87e9d8ac
: am 9d490b50
: am 88832a3d
: Merge "[Fingerprint] Disable back in setup enrolling screen" into mnc-dev
...
* commit 'de4a53624feb2e1df89a47a4dc0fce6d4a1cb3b3':
[Fingerprint] Disable back in setup enrolling screen
2015-08-01 17:52:32 +00:00
Vinit Deshpande
bce70a1f9b
am 2fbcdd34
: am 5bfa8d8a
: am 5acb871c
: am b74c0b2a
: Merge "wifi: Check for the sizeof ssid to start SoftAP" into mnc-dev
...
* commit '2fbcdd3479df61625d80e9e025352e37cf65cd70':
wifi: Check for the sizeof ssid to start SoftAP
2015-08-01 17:03:46 +00:00
Jim Miller
8ea975c128
am bb89abea
: am d0c09c48
: am 0a8b6f2b
: am efaa19d9
: Fix fingerprint enrolling bug.
...
* commit 'bb89abeaff323762f77fb8ed97dda910cc171fee':
Fix fingerprint enrolling bug.
2015-08-01 17:03:45 +00:00
Maurice Lam
de4a53624f
am e39a99e1
: am 87e9d8ac
: am 9d490b50
: am 88832a3d
: Merge "[Fingerprint] Disable back in setup enrolling screen" into mnc-dev
...
* commit 'e39a99e1d5b516f95df03befe5797efc94ffc882':
[Fingerprint] Disable back in setup enrolling screen
2015-08-01 17:03:44 +00:00
Vinit Deshpande
5bfa8d8a77
am 5acb871c
: am b74c0b2a
: Merge "wifi: Check for the sizeof ssid to start SoftAP" into mnc-dev
...
* commit '5acb871c0b7660a63f7b0708b65673a2f63fb165':
wifi: Check for the sizeof ssid to start SoftAP
2015-08-01 16:38:12 +00:00
Jim Miller
d0c09c48ae
am 0a8b6f2b
: am efaa19d9
: Fix fingerprint enrolling bug.
...
* commit '0a8b6f2b9a1b16831565c932b707c59f2ec36491':
Fix fingerprint enrolling bug.
2015-08-01 16:37:53 +00:00
Maurice Lam
87e9d8acd1
am 9d490b50
: am 88832a3d
: Merge "[Fingerprint] Disable back in setup enrolling screen" into mnc-dev
...
* commit '9d490b50406387a55dc3976cf3cf14ef09d9f98e':
[Fingerprint] Disable back in setup enrolling screen
2015-08-01 16:34:40 +00:00
Vinit Deshpande
96ae93e4d6
am b74c0b2a
: Merge "wifi: Check for the sizeof ssid to start SoftAP" into mnc-dev
...
* commit 'b74c0b2a27f4d30628fe4482a9de6387c6dbdaca':
wifi: Check for the sizeof ssid to start SoftAP
2015-08-01 00:35:01 +00:00
Vinit Deshpande
b74c0b2a27
Merge "wifi: Check for the sizeof ssid to start SoftAP" into mnc-dev
2015-08-01 00:26:01 +00:00
Sanket Padawe
a7a4a5a2cf
Allow Contact sharing by default while connecting Car Kit.
...
Bug: 22556703
Change-Id: I335115bd1f6a2b043fb2ac8eeb1f9512b542e030
2015-07-31 17:22:45 -07:00
Sunil Dutt
48c3656944
wifi: Check for the sizeof ssid to start SoftAP
...
Disable the option to start SoftAP if ssid byte length is over 32 bytes.
Bug: 22074821
Change-Id: I696dca1aac8673bff168481fde4b013450bac72c
2015-07-31 17:20:17 -07:00
Jim Miller
fe87f19bc8
am efaa19d9
: Fix fingerprint enrolling bug.
...
* commit 'efaa19d97d4aba1897357971af4c0991af71dbbd':
Fix fingerprint enrolling bug.
2015-07-31 23:49:08 +00:00