195789 Commits

Author SHA1 Message Date
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
Eino-Ville Talvala
0819c75680 Camera2: Remove HIGH_RESOLUTION level and modify FULL requirements
- Reword requirements for FULL level
- Remove HIGH_RESOLUTION level
- Add StreamConfigurationMap#getHighResolutionOutputSizes
- Clean up StreamConfigurationMap implementation
- Add 5-argument HashCodeHelper

Bug: 20945581
Change-Id: I75ad4b23e902192c96ed501e10c7d55fc0ad72a6
2015-06-22 14:21:22 -07:00
Selim Cinek
9622c0cc90 Merge "Follow-up to empty keyguard issue" into mnc-dev 2015-06-22 21:12:57 +00:00
Dirk Dougherty
813d974e33 Doc change: Explicitly state the initial API level that supports maxSdkVersion attr in uses-permission.
Change-Id: Ifb20f84560dc1c8655b8d216038a2b56777df460
2015-06-22 14:12:03 -07:00
Jeff Sharkey
c629271d48 Merge "Forget private partition keys." into mnc-dev 2015-06-22 21:09:52 +00:00
Selim Cinek
61a7d1f5f6 Follow-up to empty keyguard issue
Bug: 21124013
Change-Id: I2f880ffe1f8a69f66a37e27f700c2e8919e46acd
2015-06-22 21:09:44 +00:00
Jeff Sharkey
5cc0df214b Forget private partition keys.
When we forget a private partition, ask vold to also forget the key
for that partition GUID.  This means we need to track both the
filesystem UUID and the partition GUID for a private volume.

Bug: 21782268
Change-Id: Icda1cbb65539d61dacc663428daf3d1a2e4c313e
2015-06-22 14:07:10 -07:00
Selim Cinek
f8fbc2a7cc Showing the bouncer now when waking up from touch while lagging
Bug: 21124013
Change-Id: I21fd26180c3389191e63ca728a651a3fbc98a75e
2015-06-22 20:57:50 +00:00
Alan Viverette
696d214946 Merge "Match default color packing for captioning settings" into mnc-dev 2015-06-22 20:55:12 +00:00
Dirk Dougherty
3bd8c3618a am bee8dc62: am 19332345: Doc change: update main landing and distribute carousel items. Fix typo in Google Play card.
* commit 'bee8dc6275b5e47cc7b06c8a3f4d2a7e21b2378c':
  Doc change: update main landing and distribute carousel items. Fix typo in Google Play card.
2015-06-22 20:48:12 +00:00
Alex Klyubin
3867709fb3 Document that RSA OAEP requires digest authorization.
RSA encryption/decryption keys used with RSA OAEP padding scheme now
require the key to be authorized for the digest used by OAEP.

Bug: 21998286
Change-Id: I1f5eb1b30a1b574c45ffcabed6096de8671882d3
2015-06-22 13:42:46 -07:00
Dirk Dougherty
bee8dc6275 am 19332345: Doc change: update main landing and distribute carousel items. Fix typo in Google Play card.
* commit '19332345516292c29bf1a52e896f7aba9bb30af6':
  Doc change: update main landing and distribute carousel items. Fix typo in Google Play card.
2015-06-22 20:35:02 +00:00
Chris Wren
d1dbc92d67 add rank to notification visibility log
Only sysui knows the true rank, since it can (and does) reorder things.
The visibility logs are down in the service because it has other bits of data.

Bug: 21395744
Change-Id: Ibf9479dc2306fb27fb5df3bf21e161478d36d587
2015-06-22 16:30:17 -04:00
John Spurlock
82e595fd6e Merge "Volume: Force focused state to disambig multiple sliders." into mnc-dev 2015-06-22 20:28:40 +00:00
oleksii stepanian
2bd8e97f99 Merge "Fix race condition in PackageManager." into mnc-dev 2015-06-22 20:25:06 +00:00
Alex Klyubin
6e90ade5dd Adjust minimum size of PKCS#1 RSA padding overhead.
This raises the space overhead estimate by one byte, due to me having
originally forgotten that when signing using RSA PKCS#1 padding
scheme, the plaintext of the RSA operation needs a leading 0 byte.

Bug: 21955742
Change-Id: If78efcd375afd8902a14a2217ddedfea87d4d337
2015-06-22 13:21:59 -07:00
Svet Ganov
a2991da0d6 Remove not needed contacts related perissions.
Removing the read/write profile/social stream permissions as they
are not needed anymore. These permissions are for accessing data
nested in the conacts provider which is already guaded by the
read/write contacts runtime permissions. The removed permissions
would be in the contacts group which means they would not provide
more protection compated to read/write contacts. Also removing
the permissions voids the need for app op support for legacy apps.

Removed deprecated APIs for social streams as these were deprecated
and will go away in the next release. We want apps targeting M to
not be able to compile if still suing these APIs to help with
migration.

Change-Id: I26ed9055847af7f92c78eb0f4ac8f9f1aa616fcd
2015-06-22 13:20:55 -07:00
Selim Cinek
a0f5c76ffd Added more logging to debug the empty keyguard
Also fixed a very seldom case.

Bug: 21124013
Change-Id: I025611a36c5e80379bb88cda5bac0be04fd8ebc5
2015-06-22 20:18:15 +00:00
Alan Viverette
7e4019b741 Match default color packing for captioning settings
"Default" packed colors are indicated by zero alpha and non-zero
red/blue. The cached alpha value used by Settings is stored in green.

Bug: 21602597
Change-Id: I1465210fda854ee979aa3a6b398ae60b41d10711
2015-06-22 13:06:24 -07:00
Jason Monk
6283a12579 Merge "ButtonBarLayout: Let allowStacking to be set through code" into mnc-dev 2015-06-22 19:53:01 +00:00
Makoto Onuki
6ddc34e578 Merge "Allow binary value in SettingsProvider" into mnc-dev 2015-06-22 19:51:28 +00:00
David Christie
b870dbf86b Fix privacy leaks in LocationManager
-Register for listener for permission changes and stop
 request immediately if client loses permission.
-Also remove permission requirement to remove geofences
 and clean up permission annotations.

Bug: 21903866
Change-Id: I7e028b6b2ca5b21f25fcbba5de86dfb55caff872
2015-06-22 12:42:53 -07:00
Dirk Dougherty
1933234551 Doc change: update main landing and distribute carousel items. Fix typo in Google Play card.
Change-Id: I94b8cfbf5d0afab3d6e6db658a2e73817de9967c
2015-06-22 12:35:12 -07:00