Commit Graph

8799 Commits

Author SHA1 Message Date
Pavel Zhamaitsiak
f48424e17c am 8cf54264: Merge "Ensure that listener is removed only if it was added" into mnc-dev
* commit '8cf54264995aea65d77c25b5050cb3aac0196c59':
  Ensure that listener is removed only if it was added
2015-08-10 17:35:16 +00:00
Pavel Zhamaitsiak
8cf5426499 Merge "Ensure that listener is removed only if it was added" into mnc-dev 2015-08-10 17:29:38 +00:00
Jeff Sharkey
cb0c07181a am 67f0739c: Merge "Block moving when already in progress." into mnc-dev
* commit '67f0739ca3a81515975856b09d216debfd090ae9':
  Block moving when already in progress.
2015-08-07 23:51:57 +00:00
Jeff Sharkey
67f0739ca3 Merge "Block moving when already in progress." into mnc-dev 2015-08-07 23:38:44 +00:00
Jeff Sharkey
16634fd0ff Block moving when already in progress.
Use frozen state as a proxy for knowing if a package is currently
being moved, and block any new move requests until the current move
is finished.

Bug: 22069486
Change-Id: I50a70353132c1035b969982f0b7779f5dcb2251d
2015-08-07 15:59:28 -07:00
Billy Lau
5b2c66e4da am a59f39fc: Merge "Bug: 21588539 Move CHANGE_NETWORK_STATE to be in SYSTEM_SETTINGS" into mnc-dev
* commit 'a59f39fca65d0828b0e4ade95a8404282e858ba9':
  Bug: 21588539 Move CHANGE_NETWORK_STATE to be in SYSTEM_SETTINGS
2015-08-07 22:22:19 +00:00
Billy Lau
a59f39fca6 Merge "Bug: 21588539 Move CHANGE_NETWORK_STATE to be in SYSTEM_SETTINGS" into mnc-dev 2015-08-07 22:15:32 +00:00
Pavel Zhamaitsiak
2fe4b3cb9e Ensure that listener is removed only if it was added
Bug: 23016088
Change-Id: Ia6f17739ffc841ce8483e9c6c8132a94ecd62200
2015-08-07 12:02:38 -07:00
Julia Reynolds
b7028f254d am 5ab0e183: Merge "Hide optimization control on battery details page for non whitelisted apps." into mnc-dev
* commit '5ab0e183abdd4008c5591011804d0bc770851a7f':
  Hide optimization control on battery details page for non whitelisted apps.
2015-08-07 16:34:58 +00:00
Julia Reynolds
5ab0e183ab Merge "Hide optimization control on battery details page for non whitelisted apps." into mnc-dev 2015-08-07 16:29:41 +00:00
Andres Morales
d4c3dff6e3 am 4897fa87: Merge "fix CC for work profiles" into mnc-dev
* commit '4897fa87a55173f45bfddb2480a2e34eb412b8ef':
  fix CC for work profiles
2015-08-06 22:30:55 +00:00
Andres Morales
4897fa87a5 Merge "fix CC for work profiles" into mnc-dev 2015-08-06 22:22:17 +00:00
Julia Reynolds
2f01c5f5b5 Hide optimization control on battery details page for non whitelisted apps.
Bug: 22978210
Change-Id: If532960478dccf6ef9bea08a27167e1850749277
2015-08-06 11:42:40 -04:00
Andres Morales
7bdffd85eb fix CC for work profiles
Bug: 22257554
Change-Id: I09f62956d01f91d3014d9fa250aaff68ab5e1a9b
2015-08-05 19:57:51 -07:00
Jason Monk
150e60ca9a am 888673bd: Hide show/hide system from battery optimizations list
* commit '888673bd51acf9263163acfebdd0680358deabaa':
  Hide show/hide system from battery optimizations list
2015-08-05 20:30:40 +00:00
Jason Monk
888673bd51 Hide show/hide system from battery optimizations list
Bug: 22977820
Change-Id: I1741bfe3e8703bae8ce10503879adfd12e9eb4fc
2015-08-05 16:08:00 -04:00
Ajay Panicker
1dd985abdc am cd8acb22: Merge "Implement Bluetooth settings factory reset (5/5)" into mnc-dev
* commit 'cd8acb2256ca37ac4d1b71c513bac4e541c67c6d':
  Implement Bluetooth settings factory reset (5/5)
2015-08-05 18:01:14 +00:00
Ajay Panicker
cd8acb2256 Merge "Implement Bluetooth settings factory reset (5/5)" into mnc-dev 2015-08-05 17:49:08 +00:00
Jason Monk
c86f6dfdc8 am 244fd782: Merge "Remove summaries fro configure apps page" into mnc-dev
* commit '244fd78205827d6c77367c2a46dca661d85a6d98':
  Remove summaries fro configure apps page
2015-08-05 16:48:13 +00:00
Jason Monk
244fd78205 Merge "Remove summaries fro configure apps page" into mnc-dev 2015-08-05 14:34:14 +00:00
Billy Lau
3d9c7fc998 Bug: 21588539 Move CHANGE_NETWORK_STATE to be in SYSTEM_SETTINGS
Change the implementation of AppStateAppOpsBridge to handle multiple
requested permissions in one operation due to the merging of
CHANGE_NETWORK_STATE permission with WRITE_SETTINGS.

This change will affect the packages that will be listed under the
"Write system settings" option in Settings->Apps->[Gear/Cog].

Change-Id: I7d2304d2846b6f505a7b1c3fcf53e7a9bd184ed5
2015-08-04 23:44:36 +01:00
Ajay Panicker
568d9336ba Implement Bluetooth settings factory reset (5/5)
Implemented the factory reset function to be used to reset all bluetooth
settings on device to factory default

Bug: 16161518
Change-Id: Ie5404a4547fcf747a0bb51d515e0c97628416f4b
2015-08-04 15:28:16 -07:00
Jason Monk
9824c5da1e resolved conflicts for merge of 1adca55f to mnc-dr-dev
Change-Id: Iac88fbc39bbfb7aaa730652794b4aa73618c1d9c
2015-08-04 16:23:32 -04: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
2e3775b9b1 Merge "Update USB dialog for USB-C power option" into mnc-dr-dev 2015-08-04 17:44:00 +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
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
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
efaa19d97d Fix fingerprint enrolling bug.
This fixes a bug where rotating the device would call post_enroll()
too early, thus invalidating the current session.

Fixes bug 22708390

Change-Id: Ib4a334b50c16630b4fe4b451f6019d41225b2011
2015-07-31 23:17:24 +00:00
Maurice Lam
88832a3d4d Merge "[Fingerprint] Disable back in setup enrolling screen" into mnc-dev 2015-07-31 18:50:39 +00:00
Maurice Lam
997bcaa7d8 Merge "[Fingerprint] Advertise wake & unlock during SUW" into mnc-dev 2015-07-31 00:43:58 +00:00
Maurice Lam
5656314aca [Fingerprint] Advertise wake & unlock during SUW
Adds a string to advertise to the user that wake & unlock is
available on all fingerprint devices.

Bug: 22644642
Change-Id: I9e44174c6ab088a06f95ae5c377c8ccec13a4257
2015-07-30 17:02:26 -07:00
Nick Kralevich
8a9b03f746 UsbModeChooserActivity: Ensure MIDI available with DISALLOW_USB_FILE_TRANSFER
In ec323a0849, DISALLOW_USB_FILE_TRANSFER
turned off all USB options except for "Charge Only". This is too
aggressive. MIDI should be available when DISALLOW_USB_FILE_TRANSFER
is set.

Remove mUsbManager.isUsbDataUnlocked(). That data is available
by accessing the sticky broadcast.

Bug: 22447614
Bug: 21429947
Change-Id: Icd8398c4cf43f807acf77923b0b25c18f9a9b0d0
2015-07-30 16:34:01 -07:00
Maurice Lam
c3b48c349d [Fingerprint] Disable back in setup enrolling screen
Disable the back button because the back stack behavior is confusing.
Instead of going back to the screen the user previously saw, pressing
back in enrolling screen goes back to FindSensor.

Bug: 22848016
Change-Id: I71852eb1974f1542fb519bf8bbfdce12de62e66b
2015-07-30 13:30:32 -07:00
Jorim Jaggi
92f9bdc6ec Merge "Add dialog to confirm last fingerprint removal" into mnc-dev 2015-07-30 20:16:08 +00:00
Jorim Jaggi
12ee807c1f Add dialog to confirm last fingerprint removal
Bug: 22847296
Change-Id: Ib4984d8db0c9abc00442026360bd5617515225aa
2015-07-30 12:42:08 -07:00
Jeff Sharkey
bb9d6b906e Merge "Refresh after clearing, tweak warn threshold." into mnc-dev 2015-07-30 19:24:53 +00:00
Jeff Sharkey
f99b424f3b Refresh after clearing, tweak warn threshold.
Refresh UI after clearing cache.  Hide user header on single-user
devices to match UX spec.  Refine adopted storage warning threshold
based on experiments with various devices.

For example, a typical internal storage device runs the benchmark
in about 600ms.  Very fast SD cards take about 1700ms, moderate speed
SD cards take about 3800ms, and slow SD cards take about 6800ms.

Bug: 22345902, 22487370
Change-Id: I6066f3b78dbb32277ae94b79e325500724f83c7e
2015-07-30 11:51:47 -07:00
Billy Lau
eb372c93ee Merge "Bug: 22718745 Intents to 'draw over other apps' should go direct to the package's page instead of the top level one" into mnc-dev 2015-07-30 17:14:17 +00:00
Billy Lau
fee785645b Bug: 22718745 Intents to 'draw over other apps' should go direct to the package's
page instead of the top level one

Settings:
Added two activities to handle app-specific Intent when app invoke permission
management UI.

SettingsActivity:
Added two fragment classes to handle app-specific Intent when app invoke permission
management UI.

AndroidManifest.xml:
We handle both Intent to top level settings and app-specific management UI for
app ops protected permissions.

AppStateAppOpsBridge:
Added a new field to PermissionState to keep track of permission declared vs one
that is actually granted during install time.

AppState{Overlay/Usage/WriteSettings}Bridge:
Updated the fields affected by changes in PermissionState.

{DrawOverlay/UsageAccess/WriteSettings}Details:
Disabled the toggling of permission if the app did not declare for the asked
permission.

Change-Id: Ibf63e4d9a4fbf7899a93d2176abb1204c4f75557
2015-07-29 23:04:57 +01:00
Maurice Lam
3760e5e7e4 Merge "[ZenMode] Align text to viewStart in remove dialog" into mnc-dev 2015-07-29 18:25:48 +00:00