195758 Commits

Author SHA1 Message Date
Michael Wright
121197326c Merge "Add new hid command." into mnc-dev 2015-06-23 12:45:12 +00:00
Chris Wren
ca7febf4b8 Merge "add rank to notification visibility log" into mnc-dev 2015-06-23 12:43:09 +00:00
Zoltan Szatmary-Ban
2c3c66a2cf Merge "Introduce Settings.Global.WIFI_DEVICE_OWNER_CONFIGS_LOCKDOWN" into mnc-dev 2015-06-23 08:44:49 +00:00
Seigo Nonaka
02ebcdb911 Merge "Revive Null check for backward compatibility." into mnc-dev 2015-06-23 08:31:12 +00:00
Chris Banes
3ae5e8b25b Merge "Fix leak for MenuInflater + setActionBar" into mnc-dev 2015-06-23 07:05:43 +00:00
Bart Sears
1ef23adef8 Merge "Revert "Remove not needed contacts related perissions."" into mnc-dev 2015-06-23 06:18:20 +00:00
Bart Sears
ed5ff51b2c Revert "Remove not needed contacts related perissions."
Broke the build, reverting.

This reverts commit a2991da0d671adf511ccb884cf25bf1241303f92.

Change-Id: I2bdfa70fbd8a6c03e48426f85eeb63896762d5da
2015-06-23 06:16:25 +00:00
Eino-Ville Talvala
b14a1ac057 Merge changes from topic 'remove-high-res' into mnc-dev
* changes:
  Camera2: Fix StreamConfigurationMap#isOutputSupportedFor for depth
  Camera2: Remove HIGH_RESOLUTION level and modify FULL requirements
2015-06-23 06:07:04 +00:00
Nancy Chen
4d30d34294 Merge "Add vvm short codes to white list for sms messages." into mnc-dev 2015-06-23 04:42:54 +00:00
Svet Ganov
2b5bec9356 Merge "Remove not needed contacts related perissions." into mnc-dev 2015-06-23 04:00:06 +00:00
Svet Ganov
d669321276 Merge "Auto grant read external storage too - it is now dangerous." into mnc-dev 2015-06-23 03:52:13 +00:00
Svet Ganov
975fa474a7 Auto grant read external storage too - it is now dangerous.
We grant external storage permissions to some default handlers by
default. Read external storage was promoted to runtime permission
but was not granted as a part of the external storage group, i.e.
with write external storage.

bug:21980225

Change-Id: I1edd7ae13222f12c9a488efb1919f5cf96e4b69d
2015-06-22 20:45:38 -07:00
Jeff Brown
5869363b06 Merge "Suppress pausing activities when screen off due to proximity." into mnc-dev 2015-06-23 02:35:14 +00:00
Jeff Brown
e1633addd3 Suppress pausing activities when screen off due to proximity.
Pausing and resuming the in-call activity may have the side-effect
of releasing and reacquiring the proximity sensor wake lock which can
cause the system to enter a loop.

Although in general it might be a good idea to pause activities
whenever you can't see them, it makes more sense to treat the proximity
sensor as temporarily suppressing rather than fully pausing activities.

Bug: 21932251
Change-Id: Ie072cbe5984bec08f2c60c64ed8cc144534982db
2015-06-22 19:32:52 -07:00
Vinit Deshpande
725f145e0f Merge "Address API review comments" into mnc-dev 2015-06-23 02:31:35 +00:00
Vinit Deshpande
a0d929e505 Address API review comments
Added a flags field in ScanResult; along with flag
values and methods to read them.

Changed types of passpoint related fields.

Bug: 21342042
Bug: 21572290
Bug: 21343777

Change-Id: I413960de88b387853d11b9e10f92665e9c06a81b
2015-06-22 19:09:38 -07:00
Adam Powell
9f49dcda24 Merge "Add voice interaction support to ResolverActivity/ChooserActivity" into mnc-dev 2015-06-23 01:18:28 +00:00
Adam Powell
4c470d641c Add voice interaction support to ResolverActivity/ChooserActivity
All options are sent to the VoiceInteractor once ChooserTargetServices
have reported in. We don't perform explicit progressive refinement or
filtering, but an explicit option picked will be invoked.

Also fix a lingering bug around being able to nested-fling the
resolver drawer closed.

Bug 21516866

Change-Id: I6b141f5fa87d74dccec9dcb88110630696e9c38e
2015-06-22 18:11:10 -07:00
Christopher Tate
6d2268a576 Merge "Back up / restore default app and intent filter verification state" into mnc-dev 2015-06-23 01:02:12 +00:00
Robert Greenwalt
0c5c8570dc Merge "Return reasonable phone type if no sim inserted." into mnc-dev 2015-06-23 00:33:15 +00:00
Vinit Deshpande
a2cbb3e632 Merge changes from topic 'mwd-merge-wifi-062215' into mnc-dev
* changes:
  Added config_wifi_hotspot2_enabled.
  make sure wifi link stats are reset
2015-06-23 00:21:34 +00:00
Christopher Tate
6038d15cbc Back up / restore default app and intent filter verification state
For apps not present on device, the state inherited from the ancestral
device is applied when the app is ultimately installed.

Bug 20144515

Change-Id: Ie05b4f1751357fc62f14e259da174b8cf465e913
2015-06-22 17:20:26 -07:00
Chris Craik
484b114846 Merge "Clean up drawable filter/dither docs" into mnc-dev 2015-06-23 00:07:18 +00:00
Dianne Hackborn
0b50e56c07 Merge "Fix issue #21753257: Stability: startActivity asks to run as user 0..." into mnc-dev 2015-06-22 23:55:12 +00:00
Robin Lee
58e706d754 Merge "Let device owners handle onChoosePrivateKey" into mnc-dev 2015-06-22 23:51:02 +00:00
Jan Nordqvist
c88e8b230b Added config_wifi_hotspot2_enabled.
Change-Id: I1ebf3137e00d2b3cfb6079f599fb0ede6f56df34
(cherry picked from commit ecddf7925fd95ecedfc5bd628109ee7097979f12)
2015-06-22 16:31:08 -07:00
Pierre Vandwalle
d258d7a86e make sure wifi link stats are reset
Change-Id: I8687594eccea1e3d8b99450da5230442cdbd1a86
(cherry picked from commit 5fc9e14077c3bec51d0a93a5edeeade396d77d15)
2015-06-22 16:28:54 -07:00
Nicolas Prevot
3ab6f9e691 Merge "Allow cross-profile app linking from work to personal." into mnc-dev 2015-06-22 23:18:32 +00:00
Alan Viverette
2928f184b9 Merge "Invert time picker dialog column order when in RTL layout" into mnc-dev 2015-06-22 23:10:12 +00:00
Jeff Davidson
edce8bd01b Merge "Define a list of carrier apps to disable by default until use." into mnc-dev 2015-06-22 23:08:27 +00:00
Alan Viverette
ed0e11a93a Merge "Ensure child is attached before performing measure/layout in Spinner" into mnc-dev 2015-06-22 23:07:33 +00:00
Ian Pedowitz
c16a26a2b9 Merge "Renaming bugreport.txt to bugreportFile.getName()" into mnc-dev 2015-06-22 23:01:10 +00:00
Robert Greenwalt
d314de0aa4 Return reasonable phone type if no sim inserted.
With no sim, there's no subscription, no default phone, etc.
If we're asked for phone type for an invalid sub, just use the
first phone.

bug: 20760370
Change-Id: Ide7b0679e7253e1f1ce563a68fbbec1ff8c24daf
2015-06-22 15:56:46 -07:00
Dirk Dougherty
b94daae3fd am c8a94c5b: am 813d974e: Doc change: Explicitly state the initial API level that supports maxSdkVersion attr in uses-permission.
* commit 'c8a94c5b6df42b631e52dcae03d0243454886ecb':
  Doc change: Explicitly state the initial API level that supports maxSdkVersion attr in uses-permission.
2015-06-22 22:41:19 +00:00
Alan Viverette
aeaa396cae Merge "Revert "Revert "Work around inconsistent views in RelativeLayout.onMeasure()""" into mnc-dev 2015-06-22 22:38:09 +00:00
Alan Viverette
9554f9fc9e Revert "Revert "Work around inconsistent views in RelativeLayout.onMeasure()""
Turns out this was actually fine.

This reverts commit 9355533bf6f3bcd3fb72fc840253d08ca7dad379.

Change-Id: I30c66fd423b569958244685098511d4ba08fbf37
2015-06-22 22:37:58 +00:00
Dianne Hackborn
a825c084f8 Fix issue #21753257: Stability: startActivity asks to run as user 0...
...but is calling from user 10

Change-Id: Ia4b8ace6ad140c1727fe944882e0d5b5c650260b
2015-06-22 15:29:06 -07:00
Alex Klyubin
e26f9d95c6 Merge "Adjust minimum size of PKCS#1 RSA padding overhead." into mnc-dev 2015-06-22 22:27:51 +00:00
Alex Klyubin
bf224d93cc Merge "Document that RSA OAEP requires digest authorization." into mnc-dev 2015-06-22 22:27:38 +00:00
Dirk Dougherty
c8a94c5b6d am 813d974e: Doc change: Explicitly state the initial API level that supports maxSdkVersion attr in uses-permission.
* commit '813d974e33366aaeeb54e242e2767d4eeaf940dc':
  Doc change: Explicitly state the initial API level that supports maxSdkVersion attr in uses-permission.
2015-06-22 22:26:59 +00:00
Alan Viverette
25c6cd61d4 Ensure child is attached before performing measure/layout in Spinner
Bug: 21614663
Change-Id: Id84a720fac7050d312eb2eb6f12621217c4f8d0f
2015-06-22 15:25:55 -07:00
Alan Viverette
81598d7adf Invert time picker dialog column order when in RTL layout
Bug: 21933765
Change-Id: I39becd18f093ea2d3e9adf8affc9b32dfce19c8e
2015-06-22 15:25:08 -07:00
Chris Craik
15d8a2bc77 Merge "Avoid flushing DisplayListCanvas state for noop calls" into mnc-dev 2015-06-22 22:20:14 +00:00
Jeff Davidson
50ca295020 Define a list of carrier apps to disable by default until use.
Bug: 21814643
Change-Id: Ifc8b99526fbe3aa5e276d2d1c1872a9b8d89f9ec
2015-06-22 15:07:41 -07:00
Chris Craik
772687d242 Avoid flushing DisplayListCanvas state for noop calls
bug:22006795

Change-Id: I2eceee69772b08f5319ea882be429a5b36860b7d
2015-06-22 14:51:18 -07:00
Matthew Williams
8b1db0746f Merge "Cancel Syncs that aren't making progress." into mnc-dev 2015-06-22 21:41:49 +00:00
Nicolas Prevot
9edbda18df Allow cross-profile app linking from work to personal.
If the profile owner sets ALLOW_PARENT_APP_LINKING:

ACTION_VIEW, scheme http/https intents sent from the work profile
can be resolved by personal apps if they specify a host.

BUG:21701782
Change-Id: I372e2405345539eac9d6b4fb08def6bf84da14a6
2015-06-22 14:39:44 -07:00
Matthew Williams
1967c8ddd5 Cancel Syncs that aren't making progress.
BUG: 18266674
1) If a sync has up/downloaded less than 10bytes in 60 seconds it is
considered to be making no progress and is summarily cancelled.

2) Apply a 30min hard time-out to initialization syncs.

Note that there is little proof that cancelling a sync has an
impact. All it results in is a Thread.interrupt on the sync
thread, which the adapter must itself implement. To this effect
this CL also updates the javadoc to make this clearer, and adds
some (unimplemented) threats about killing the hosting process.

Change-Id: I83c447648152ccbf76bb1fbd7e9216e01a37952f
2015-06-22 14:36:36 -07:00
David Christie
f7340e754e Merge "Fix privacy leaks in LocationManager" into mnc-dev 2015-06-22 21:26:49 +00:00
Eino-Ville Talvala
e365120aae Camera2: Fix StreamConfigurationMap#isOutputSupportedFor for depth
Need to check the right configuration list if the format is a
depth format.

Also refactor code slightly to use SurfaceUtils when possible.

Bug: 21902551
Change-Id: Icca2e81d8144bede46ad9f117d5e010ed409887c
2015-06-22 14:21:22 -07:00