OSDN Git Service

android-x86/frameworks-base.git
9 years agoDon't always transfer device owner status to other users.
Nicolas Prevot [Tue, 28 Jul 2015 19:41:12 +0000 (20:41 +0100)]
Don't always transfer device owner status to other users.

A device owner cannot use device or profile owner policies on
other users unless it is profile owner there. Also limit device
initializer to system apps only.

Bug: 21800830
Change-Id: Ie1abbd891945b91b17ecdf7f73ba93aaa19819be

9 years agoMerge "Revert "Call getInstanceForPackage instead of creating a new SensorManager...
Narayan Kamath [Wed, 29 Jul 2015 09:41:22 +0000 (09:41 +0000)]
Merge "Revert "Call getInstanceForPackage instead of creating a new SensorManager instance."" into mnc-dev

9 years agoRevert "Call getInstanceForPackage instead of creating a new SensorManager instance."
Narayan Kamath [Wed, 29 Jul 2015 09:35:46 +0000 (09:35 +0000)]
Revert "Call getInstanceForPackage instead of creating a new SensorManager instance."

This reverts commit 5967ddbf05f146bdb6744207e3daed1aa76fc637.

Change-Id: I6d58129585a30d7c2ef39c8cbe796fd696c93f56

9 years agoMerge "Resource for setting default NFC payment component." into mnc-dev
Martijn Coenen [Wed, 29 Jul 2015 07:54:29 +0000 (07:54 +0000)]
Merge "Resource for setting default NFC payment component." into mnc-dev

9 years agoMerge "Keymaster digest/padding NONE no longer means ANY." into mnc-dev
Shawn Willden [Wed, 29 Jul 2015 03:58:39 +0000 (03:58 +0000)]
Merge "Keymaster digest/padding NONE no longer means ANY." into mnc-dev

9 years agoMerge "Give secondary users read-only physical cards." into mnc-dev
Jeff Sharkey [Wed, 29 Jul 2015 01:19:43 +0000 (01:19 +0000)]
Merge "Give secondary users read-only physical cards." into mnc-dev

9 years agoMerge "media: fix estimateFrameRatesFor to use correct ratio" into mnc-dev
Ronghua Wu [Wed, 29 Jul 2015 00:53:12 +0000 (00:53 +0000)]
Merge "media: fix estimateFrameRatesFor to use correct ratio" into mnc-dev

9 years agoMerge "Fix issue #22802691: APR: NPE in ActivityRecord" into mnc-dev
Dianne Hackborn [Wed, 29 Jul 2015 00:47:33 +0000 (00:47 +0000)]
Merge "Fix issue #22802691: APR: NPE in ActivityRecord" into mnc-dev

9 years agoMerge "Fix issue #22802617: APR: spurious wtf when restarting a persistent process...
Dianne Hackborn [Wed, 29 Jul 2015 00:46:20 +0000 (00:46 +0000)]
Merge "Fix issue #22802617: APR: spurious wtf when restarting a persistent process" into mnc-dev

9 years agoMerge "Fix issue #22802782: APR: NPE in package manager with bad intent data" into...
Dianne Hackborn [Wed, 29 Jul 2015 00:45:18 +0000 (00:45 +0000)]
Merge "Fix issue #22802782: APR: NPE in package manager with bad intent data" into mnc-dev

9 years agoFix issue #22802691: APR: NPE in ActivityRecord
Dianne Hackborn [Wed, 29 Jul 2015 00:40:06 +0000 (17:40 -0700)]
Fix issue #22802691: APR: NPE in ActivityRecord

Change-Id: I8d6265589c97edc7a1d6c63f98c7252a439e62da

9 years agoMerge "BatteryStats: Use proper power calculator when energy data is received" into...
Adam Lesinski [Wed, 29 Jul 2015 00:34:38 +0000 (00:34 +0000)]
Merge "BatteryStats: Use proper power calculator when energy data is received" into mnc-dev

9 years agoMerge "Add sizes to SysUI tests" into mnc-dev
Jason Monk [Wed, 29 Jul 2015 00:31:16 +0000 (00:31 +0000)]
Merge "Add sizes to SysUI tests" into mnc-dev

9 years agoFix issue #22802782: APR: NPE in package manager with bad intent data
Dianne Hackborn [Wed, 29 Jul 2015 00:30:59 +0000 (17:30 -0700)]
Fix issue #22802782: APR: NPE in package manager with bad intent data

If they pass in a null data for the intent matching, don't throw up
on it, just consider it to not match.

Change-Id: I30b6af49989eb8b5c2e585ce5d96416f0daff3a8

9 years agoFix issue #22802617: APR: spurious wtf when restarting a persistent process
Dianne Hackborn [Wed, 29 Jul 2015 00:22:46 +0000 (17:22 -0700)]
Fix issue #22802617: APR: spurious wtf when restarting a persistent process

Just don't do a wtf here, it isn't really wrong (though it isn't really
right, but at this point in a release it is right enough!).

Change-Id: Ic38a2e27556224cf8868f1fa18b4810929d67fcc

9 years agoMerge "Call getInstanceForPackage instead of creating a new SensorManager instance...
Aravind Akella [Wed, 29 Jul 2015 00:21:18 +0000 (00:21 +0000)]
Merge "Call getInstanceForPackage instead of creating a new SensorManager instance." into mnc-dev

9 years agoBatteryStats: Use proper power calculator when energy data is received
Adam Lesinski [Wed, 29 Jul 2015 00:11:29 +0000 (17:11 -0700)]
BatteryStats: Use proper power calculator when energy data is received

We check for the presence of energy data when determining whether to use
the WiFiPowerCalculator or WiFiPowerEstimator. Since we can receive this data
later, we need to switch to the WiFiPowerCalculator if we weren't using it before.

We can't ask the hardware if it supports energy data because that would involve a call into
WiFiManagerService, which can cause a deadlock if we are holding the BatteryStatsService lock
while using this class.

Bug:22776010
Change-Id: Id685d487c56595eab1d382f49da9417a423bb517

9 years agoAnimation for touch, wake and unlock
Jorim Jaggi [Fri, 10 Jul 2015 21:24:44 +0000 (14:24 -0700)]
Animation for touch, wake and unlock

- Add callback to inform SysUI when the screen has been unblocked
and turned on.
- Cleanup inconsistent messaging about device interactive/screen on
and off.
- Add callbacks to inform SysUI about screen states
- Implement a quick fade for the scrim after touch, wake, and unlock.
  First, start with a black scrim on top of everything, and then fade
  it out.
- Make sure we play the normal unlock animation when device is pulsing
- Override navigation bar animations for touch, wake and unlock: Fade
  in the same manner as the scrim.

Bug: 22571198
Bug: 21855614
Change-Id: I8ff08d72cced1e0f03c78d71ff710d8a4f6b848c

9 years agoMerge "Don't redundantly call transport.finishRestore()" into mnc-dev
Chris Tate [Tue, 28 Jul 2015 22:56:41 +0000 (22:56 +0000)]
Merge "Don't redundantly call transport.finishRestore()" into mnc-dev

9 years agoMerge "Add filter for personal apps that are not disabled until first use" into mnc-dev
Zach Johnson [Tue, 28 Jul 2015 22:36:30 +0000 (22:36 +0000)]
Merge "Add filter for personal apps that are not disabled until first use" into mnc-dev

9 years agoMerge "Partially revert package freezing" into mnc-dev
Todd Kennedy [Tue, 28 Jul 2015 22:15:43 +0000 (22:15 +0000)]
Merge "Partially revert package freezing" into mnc-dev

9 years agomedia: fix estimateFrameRatesFor to use correct ratio
Ronghua Wu [Tue, 28 Jul 2015 22:05:51 +0000 (15:05 -0700)]
media: fix estimateFrameRatesFor to use correct ratio

Bug: 22504214
Change-Id: I5a325ae495b76aadd3fcbb8932d865c2f6322b2a

9 years agoGive secondary users read-only physical cards.
Jeff Sharkey [Tue, 28 Jul 2015 17:49:47 +0000 (10:49 -0700)]
Give secondary users read-only physical cards.

Long ago, we mounted secondary physical cards as readable by all
users on the device, which enabled the use-case of loading media on
a card and viewing it from all users.

More recently, we started giving write access to these secondary
physical cards, but this created a one-directional channel for
communication across user boundaries; something that CDD disallows.

This change is designed to give us the best of both worlds: the
package-specific directories are writable for the user that mounted
the card, but access to those "Android" directories are blocked for
all other users.  Other users remain able to read content elsewhere
on the card.

Bug: 22787184
Change-Id: Ied8c98995fec1b7b50ff7d930550feabb4398582

9 years agoDon't redundantly call transport.finishRestore()
Christopher Tate [Tue, 28 Jul 2015 20:59:35 +0000 (13:59 -0700)]
Don't redundantly call transport.finishRestore()

The RestoreSession is no longer responsible for calling finishRestore();
that happens as part of tidying up after running the restore itself,
even in failure cases.

Bug 22640096

Change-Id: I0be52af2ae8c2c1ac685e9904ccb8120f7fcf522

9 years agoPartially revert package freezing
Todd Kennedy [Tue, 28 Jul 2015 20:52:49 +0000 (13:52 -0700)]
Partially revert package freezing

On the Nexus Player, upgrading the launcher would cause multiple, simultaneous
processes to be running. In order to prevent this regression, revert the portion
of ag/682591 dealing with package upgrades.

Bug: 21123444
Change-Id: I7a4cf98c7e28fc9893b1c0358d3a98702d94c039

9 years agoMerge "Add "Call subject" capability to phone accounts." into mnc-dev
Tyler Gunn [Tue, 28 Jul 2015 20:07:40 +0000 (20:07 +0000)]
Merge "Add "Call subject" capability to phone accounts." into mnc-dev

9 years agoMerge "Work on issue #21516866: Implement voice interaction in ResolverActivity"...
Dianne Hackborn [Tue, 28 Jul 2015 19:52:53 +0000 (19:52 +0000)]
Merge "Work on issue #21516866: Implement voice interaction in ResolverActivity" into mnc-dev

9 years agoWork on issue #21516866: Implement voice interaction in ResolverActivity
Dianne Hackborn [Tue, 28 Jul 2015 01:11:14 +0000 (18:11 -0700)]
Work on issue #21516866: Implement voice interaction in ResolverActivity

The main change here is to not allow the dialog to go in to its "focus
on the last app the user selected" when running in voice interaction mode,
instead just always giving a simple list.

This also fixes some problems with cleaning up active commands when
an activity finishes and not forcing the current session to go away
when the screen is turned off.

Also added some debug help, having activity print the state of the
voice interactor.

Change-Id: Ifebee9c74d78398a730a280bb4970f47789dadf5

9 years agoMerge "Don't use screenshot if structure is disabled (1/2)" into mnc-dev
Jorim Jaggi [Tue, 28 Jul 2015 19:49:44 +0000 (19:49 +0000)]
Merge "Don't use screenshot if structure is disabled (1/2)" into mnc-dev

9 years agoMerge "Un-remove legacy ConnectivityManager API." into mnc-dev
Robert Greenwalt [Tue, 28 Jul 2015 19:39:48 +0000 (19:39 +0000)]
Merge "Un-remove legacy ConnectivityManager API." into mnc-dev

9 years agoKeymaster digest/padding NONE no longer means ANY.
Alex Klyubin [Tue, 21 Jul 2015 20:38:48 +0000 (13:38 -0700)]
Keymaster digest/padding NONE no longer means ANY.

This adjusts the public API documentation to no longer say that
digest/padding NONE means any digest/padding. This also changes the
implementation of legacy key generation and import to explicitly
list which digests/paddings the generated/imported key is authorized
for. Previously, such keys were simply authorized for digest NONE and
padding NONE.

Bug: 22556114
Change-Id: Id02d9450a07de16ccb795b76b6de0006dd49dcca

9 years agoUn-remove legacy ConnectivityManager API.
Robert Greenwalt [Tue, 28 Jul 2015 18:41:31 +0000 (11:41 -0700)]
Un-remove legacy ConnectivityManager API.

These were @removed too soon.  We need to keep them @deprecated until
the bulk of devices support the new API and then we can remove them.

bug:22728205
Change-Id: If1b46ff1878f1778517624112b195c461645ddd1

9 years agoMerge "Fix network name not showing in QS sometimes" into mnc-dev
Jason Monk [Tue, 28 Jul 2015 18:05:49 +0000 (18:05 +0000)]
Merge "Fix network name not showing in QS sometimes" into mnc-dev

9 years agoAdd sizes to SysUI tests
Jason Monk [Tue, 28 Jul 2015 13:18:08 +0000 (09:18 -0400)]
Add sizes to SysUI tests

Change-Id: I27e4a60e2658d3a5db32cdeb73bd0a031865ce86

9 years agoMerge "BatteryStats: Compensate for accuracy issues when reporting WiFi energy data...
Adam Lesinski [Tue, 28 Jul 2015 01:06:14 +0000 (01:06 +0000)]
Merge "BatteryStats: Compensate for accuracy issues when reporting WiFi energy data issues with Slog.wtf" into mnc-dev

9 years agoMerge changes I5c994de5,I6cb0dd84 into mnc-dev
Lorenzo Colitti [Tue, 28 Jul 2015 01:03:44 +0000 (01:03 +0000)]
Merge changes I5c994de5,I6cb0dd84 into mnc-dev

* changes:
  Add a test for public bugs 2111 and 2136.
  Always check off-link connectivity in NetworkDiagnostics.

9 years agoDon't use screenshot if structure is disabled (1/2)
Jorim Jaggi [Tue, 28 Jul 2015 00:48:42 +0000 (17:48 -0700)]
Don't use screenshot if structure is disabled (1/2)

Bug: 22674955
Change-Id: I694bb8dbb578da9d729414c7f2947ba4c15651e3

9 years agoMerge "Allow assist gesture when notification shade is expanded" into mnc-dev
Jorim Jaggi [Tue, 28 Jul 2015 00:36:14 +0000 (00:36 +0000)]
Merge "Allow assist gesture when notification shade is expanded" into mnc-dev

9 years agoBatteryStats: Compensate for accuracy issues when reporting WiFi energy data issues...
Adam Lesinski [Tue, 28 Jul 2015 00:19:23 +0000 (17:19 -0700)]
BatteryStats: Compensate for accuracy issues when reporting WiFi energy data issues with Slog.wtf

In practice I've seen the reported time spent in all WiFi energy states ~20 milliseconds larger
than the time between samples, which seems reasonable.

This will reduce false positives in APR.

Bug:22774068
Change-Id: Ibf33c9826586c8a1b70449b9a609cb51bdfc08b8

9 years agoMerge "Allow text selection handles to scroll horizontally" into mnc-dev
Mady Mellor [Tue, 28 Jul 2015 00:16:49 +0000 (00:16 +0000)]
Merge "Allow text selection handles to scroll horizontally" into mnc-dev

9 years agoMerge "Update DngCreator to correctly handle array sizes." into mnc-dev
Ruben Brunk [Tue, 28 Jul 2015 00:11:36 +0000 (00:11 +0000)]
Merge "Update DngCreator to correctly handle array sizes." into mnc-dev

9 years agoMerge "AAPT: Fix printing of resource configurations" into mnc-dev
Adam Lesinski [Tue, 28 Jul 2015 00:08:45 +0000 (00:08 +0000)]
Merge "AAPT: Fix printing of resource configurations" into mnc-dev

9 years agoMerge "Remove unnecessary relayout call from traversals." into mnc-dev
Filip Gruszczynski [Tue, 28 Jul 2015 00:04:44 +0000 (00:04 +0000)]
Merge "Remove unnecessary relayout call from traversals." into mnc-dev

9 years agoAAPT: Fix printing of resource configurations
Adam Lesinski [Mon, 27 Jul 2015 23:53:14 +0000 (16:53 -0700)]
AAPT: Fix printing of resource configurations

Print out proper, copied configuration. We add fields to ResTable_config
and if we don't copy and fill in defaults when reading old configurations,
we end up with garbage values. This can potentially cause a crash as well.

Bug:22773426
Change-Id: I64f5ebe73ee72453bcdad3a19e48f8e7ad58e9c2

9 years agoMerge "Added missing check for MANAGE_USERS" into mnc-dev
Fyodor Kupolov [Mon, 27 Jul 2015 23:43:32 +0000 (23:43 +0000)]
Merge "Added missing check for MANAGE_USERS" into mnc-dev

9 years agoAdd "Call subject" capability to phone accounts.
Tyler Gunn [Mon, 27 Jul 2015 23:06:16 +0000 (16:06 -0700)]
Add "Call subject" capability to phone accounts.

Indicates whether the phone account supports displaying a subject line
for incoming calls and sending a subject line for outgoing calls.
Supports the IMS Instant Lettering feature.

Bug: 22769741
Change-Id: I6d803dc288bfd6d4e356310a8d10d5468c5d4186

9 years agoUpdate DngCreator to correctly handle array sizes.
Ruben Brunk [Wed, 22 Jul 2015 00:51:54 +0000 (17:51 -0700)]
Update DngCreator to correctly handle array sizes.

- Allow both pixelArraySize and preCorrectionArraySize
  buffer dimensions for input buffers.
- Adjust crop, active area, and dimensions used for
  opcode lists based on the input buffer size.

Bug: 22302614
Bug: 22210811
Change-Id: I16fb8921a144b0a251d555037ca45fdc12f7dd18

9 years agoMerge "Allow soft hyphens in languages without patterns" into mnc-dev
Raph Levien [Mon, 27 Jul 2015 21:50:16 +0000 (21:50 +0000)]
Merge "Allow soft hyphens in languages without patterns" into mnc-dev

9 years agoAdded missing check for MANAGE_USERS
Fyodor Kupolov [Mon, 27 Jul 2015 21:30:59 +0000 (14:30 -0700)]
Added missing check for MANAGE_USERS

setUserRestriction should do the same permission check as setUserRestrictions
method.

Bug: 22767990
Change-Id: I01f0508ebb23deafaa32ad5dd7063b98a78641be

9 years agoEnforce DISALLOW_MOUNT_PHYSICAL_MEDIA.
Jeff Sharkey [Mon, 27 Jul 2015 21:19:54 +0000 (14:19 -0700)]
Enforce DISALLOW_MOUNT_PHYSICAL_MEDIA.

Bug: 22697024
Change-Id: Ib7277e8850a49909e5d8d5ad5502cd9315cddf0b

9 years agoCall getInstanceForPackage instead of creating a new SensorManager instance.
Aravind Akella [Sat, 25 Jul 2015 00:35:31 +0000 (17:35 -0700)]
Call getInstanceForPackage instead of creating a new SensorManager instance.

Bug: 22529981
Change-Id: Id3adfbcf55d1268db1a555c72a06456a5219c086

9 years agoMerge "Added the content description for the fingerprint icon" into mnc-dev
Selim Cinek [Mon, 27 Jul 2015 20:51:57 +0000 (20:51 +0000)]
Merge "Added the content description for the fingerprint icon" into mnc-dev

9 years agoAllow soft hyphens in languages without patterns
Raph Levien [Mon, 27 Jul 2015 20:06:24 +0000 (13:06 -0700)]
Allow soft hyphens in languages without patterns

This patch sets up an "empty" hyphenator, which it uses by default
for locales in which there is no hyphenation pattern data. This has
the effect of enabling soft hyphens (U+00AD), which were otherwise
disabled, because the "no-hyphen" code path didn't consider them.

Bug: 19605972
Change-Id: I4dcb95cee8edc48495f7c38736f5abf26fa04935

9 years agoMerge "BatteryStats: Prevent BatteryService from blocking" into mnc-dev
Adam Lesinski [Mon, 27 Jul 2015 20:01:34 +0000 (20:01 +0000)]
Merge "BatteryStats: Prevent BatteryService from blocking" into mnc-dev

9 years agoMerge "Allow Settings to set background data restrict on secondary users." into mnc-dev
Julia Reynolds [Mon, 27 Jul 2015 19:51:24 +0000 (19:51 +0000)]
Merge "Allow Settings to set background data restrict on secondary users." into mnc-dev

9 years agoRevert "am 1c964bec: Revert "am 6397ae6a: Merge "Update data binding for RC1." into...
George Mount [Mon, 27 Jul 2015 19:39:28 +0000 (12:39 -0700)]
Revert "am 1c964bec: Revert "am 6397ae6a: Merge "Update data binding for RC1." into mnc-preview-docs""

This reverts commit 01fe3f86b1c1e0eb3d8c9ab0b2251233f9164c5d, reversing
changes made to b83b5fa641847ee1d533253ba5e1a3e13913b9d9.

This change is valid for mnc-dev and other mnc branches.

9 years agoMerge "Fix QS switch accessibility problem" into mnc-dev
Jason Monk [Mon, 27 Jul 2015 19:27:29 +0000 (19:27 +0000)]
Merge "Fix QS switch accessibility problem" into mnc-dev

9 years agoMerge "Pass correct extras to the custom print options activity" into mnc-dev
Svetoslav Ganov [Mon, 27 Jul 2015 19:23:37 +0000 (19:23 +0000)]
Merge "Pass correct extras to the custom print options activity" into mnc-dev

9 years agoFix QS switch accessibility problem
Jason Monk [Mon, 27 Jul 2015 19:17:14 +0000 (15:17 -0400)]
Fix QS switch accessibility problem

Set the switch state so it can be read back correctly.

Bug: 22710906
Change-Id: I2bcba96e53813118eb2be8dcb7e0b7d547767550

9 years agoAllow Settings to set background data restrict on secondary users.
Julia Reynolds [Mon, 27 Jul 2015 19:10:42 +0000 (15:10 -0400)]
Allow Settings to set background data restrict on secondary users.

Bug: 22721091
Change-Id: Iadfbd25f75f233f2c3c080e0de05b0244572b6cd

9 years agoMerge "Move PIN/Pattern appear animation to RenderThread (1/2)" into mnc-dev
Jorim Jaggi [Mon, 27 Jul 2015 18:55:29 +0000 (18:55 +0000)]
Merge "Move PIN/Pattern appear animation to RenderThread (1/2)" into mnc-dev

9 years agoRemove unnecessary relayout call from traversals.
Filip Gruszczynski [Mon, 27 Jul 2015 15:52:50 +0000 (08:52 -0700)]
Remove unnecessary relayout call from traversals.

All the necessary information (most importantly outsets) arrives in
addWindowToDisplay that is happening a few lines earlier.

Bug: 22073222
Change-Id: I483e98808877f32812c0e959cdfc14b4e0ca5e62

9 years agoBatteryStats: Prevent BatteryService from blocking
Adam Lesinski [Mon, 27 Jul 2015 18:43:05 +0000 (11:43 -0700)]
BatteryStats: Prevent BatteryService from blocking

BatteryService is a low level service, and we shouldn't have it
block in BatteryStatsService while collecting external data from
components like WiFi. Deadlocks can occur this way.

Bug:22559655
Change-Id: I64026453d191695eb583a47163ab6f48f882b085

9 years agoam 1c964bec: Revert "am 6397ae6a: Merge "Update data binding for RC1." into mnc-previ...
George Mount [Mon, 27 Jul 2015 18:24:40 +0000 (18:24 +0000)]
am 1c964bec: Revert "am 6397ae6a: Merge "Update data binding for RC1." into mnc-preview-docs"

* commit '1c964bece6ce1bbbf9f641d95df3bf2de01f6ab7':
  Revert "am 6397ae6a: Merge "Update data binding for RC1." into mnc-preview-docs"

9 years agoRevert "am 6397ae6a: Merge "Update data binding for RC1." into mnc-preview-docs"
George Mount [Mon, 27 Jul 2015 17:38:22 +0000 (10:38 -0700)]
Revert "am 6397ae6a: Merge "Update data binding for RC1." into mnc-preview-docs"

This reverts commit c571a9a1d026cbf262cf36a5348f99d1ca0ec835, reversing
changes made to a29cfefe2c157a28b256771b1dce4653d405dcf1.

This should fix the build break for LMP downstream branches.

Change-Id: I22aac1dd0fb7965a2877bae224bccc8df8ee8e17

9 years agoMerge "Check for ACCESS_COARSE_LOCATION/ACCESS_FINE_LOCATION" into mnc-dev
Fyodor Kupolov [Mon, 27 Jul 2015 17:27:02 +0000 (17:27 +0000)]
Merge "Check for ACCESS_COARSE_LOCATION/ACCESS_FINE_LOCATION" into mnc-dev

9 years agoMerge "Fix bitmap get/set pixels for ALPHA_8" into mnc-dev
Chris Craik [Mon, 27 Jul 2015 17:23:52 +0000 (17:23 +0000)]
Merge "Fix bitmap get/set pixels for ALPHA_8" into mnc-dev

9 years agoMerge "MIDI: fix running status parser" into mnc-dev
Phil Burk [Mon, 27 Jul 2015 17:15:04 +0000 (17:15 +0000)]
Merge "MIDI: fix running status parser" into mnc-dev

9 years agoMerge "Revert "Invoke geolocation permissions callback with denied state by default...
Tim Volodine [Mon, 27 Jul 2015 16:37:57 +0000 (16:37 +0000)]
Merge "Revert "Invoke geolocation permissions callback with denied state by default."" into mnc-dev

9 years agoRevert "Invoke geolocation permissions callback with denied state by default."
Tim Volodine [Thu, 23 Jul 2015 17:16:16 +0000 (17:16 +0000)]
Revert "Invoke geolocation permissions callback with denied state by default."

This reverts commit 954d1333c478d4dba6c9a0536510da4fd94c0622.

The revert is due to apps calling super.onGeolocationPermissionsShowPrompt see b/22685046

Bug: 22685046
Change-Id: I2a9f42b432a010828a0cafaee064480bb0f91cbe
(cherry picked from commit 0bb7d2e46710932d09688a18d4c5836f9b1413a5)

9 years agoam c571a9a1: am 6397ae6a: Merge "Update data binding for RC1." into mnc-preview-docs
George Mount [Mon, 27 Jul 2015 14:49:16 +0000 (14:49 +0000)]
am c571a9a1: am 6397ae6a: Merge "Update data binding for RC1." into mnc-preview-docs

* commit 'c571a9a1d026cbf262cf36a5348f99d1ca0ec835':
  Update data binding for RC1.

9 years agoam a29cfefe: (-s ours) am 95e6ae3a: (-s ours) Merge "DO NOT MERGE ANYWHERE. Add data...
George Mount [Mon, 27 Jul 2015 14:49:11 +0000 (14:49 +0000)]
am a29cfefe: (-s ours) am 95e6ae3a: (-s ours) Merge "DO NOT MERGE ANYWHERE. Add data binding to built javadoc." into mnc-preview-docs

* commit 'a29cfefe2c157a28b256771b1dce4653d405dcf1':
  DO NOT MERGE ANYWHERE. Add data binding to built javadoc.

9 years agoam 6397ae6a: Merge "Update data binding for RC1." into mnc-preview-docs
George Mount [Mon, 27 Jul 2015 14:35:50 +0000 (14:35 +0000)]
am 6397ae6a: Merge "Update data binding for RC1." into mnc-preview-docs

* commit '6397ae6a0aedb8c7d085bb8907fc46a0e5bd7065':
  Update data binding for RC1.

9 years agoam 95e6ae3a: (-s ours) Merge "DO NOT MERGE ANYWHERE. Add data binding to built javado...
George Mount [Mon, 27 Jul 2015 14:35:45 +0000 (14:35 +0000)]
am 95e6ae3a: (-s ours) Merge "DO NOT MERGE ANYWHERE. Add data binding to built javadoc." into mnc-preview-docs

* commit '95e6ae3ad1ba8647494f0b5007b7beee76493e03':
  DO NOT MERGE ANYWHERE. Add data binding to built javadoc.

9 years agoMerge "Update data binding for RC1." into mnc-preview-docs
George Mount [Mon, 27 Jul 2015 14:24:34 +0000 (14:24 +0000)]
Merge "Update data binding for RC1." into mnc-preview-docs

9 years agoMerge "DO NOT MERGE ANYWHERE. Add data binding to built javadoc." into mnc-preview...
George Mount [Mon, 27 Jul 2015 14:24:17 +0000 (14:24 +0000)]
Merge "DO NOT MERGE ANYWHERE. Add data binding to built javadoc." into mnc-preview-docs

9 years agoResource for setting default NFC payment component.
Martijn Coenen [Mon, 27 Jul 2015 13:58:32 +0000 (15:58 +0200)]
Resource for setting default NFC payment component.

Bug: 22756856
Change-Id: If97e0faead995fb95893a128c1890b61bbe86ce5

9 years agoMerge "decide interruptions based on current data, not previous data." into mnc-dev
Chris Wren [Mon, 27 Jul 2015 13:10:11 +0000 (13:10 +0000)]
Merge "decide interruptions based on current data, not previous data." into mnc-dev

9 years agoMerge "add ticker to enqueue message for easier debugging" into mnc-dev
Chris Wren [Mon, 27 Jul 2015 13:09:15 +0000 (13:09 +0000)]
Merge "add ticker to enqueue message for easier debugging" into mnc-dev

9 years agoAdd a test for public bugs 2111 and 2136.
Lorenzo Colitti [Mon, 27 Jul 2015 07:35:22 +0000 (16:35 +0900)]
Add a test for public bugs 2111 and 2136.

Bug: 22602137
Bug: 22104401
Change-Id: I5c994de53b5906416767a8a1abe38fe59afb7cc0

9 years agoAlways check off-link connectivity in NetworkDiagnostics.
Lorenzo Colitti [Mon, 27 Jul 2015 07:35:33 +0000 (16:35 +0900)]
Always check off-link connectivity in NetworkDiagnostics.

Currently, NetworkDiagnostics only checks off-link connectivity if
one of the DNS servers is off-link. Make it check off-link
connectivity in all cases by sending probes to Google Public DNS
if off-link DNS servers are not specified.

Bug: 22569331
Bug: 22641669
Bug: 22748900
Change-Id: I6cb0dd8491bc0c1a488631deca56722b9c1d2b3f

9 years agoMerge "Change to connectivitycheck.gstatic.com" into mnc-dev
Erik Kline [Mon, 27 Jul 2015 02:35:09 +0000 (02:35 +0000)]
Merge "Change to connectivitycheck.gstatic.com" into mnc-dev

9 years agoPass correct extras to the custom print options activity
Svet Ganov [Sat, 25 Jul 2015 19:10:54 +0000 (12:10 -0700)]
Pass correct extras to the custom print options activity

bug:22734138

Change-Id: Iea1bc32c3e863072b2021b823bef2cefa54fa540

9 years agoMerge "Also check app-ops on path-permissions." into mnc-dev
Jeff Sharkey [Sat, 25 Jul 2015 02:05:56 +0000 (02:05 +0000)]
Merge "Also check app-ops on path-permissions." into mnc-dev

9 years agoMerge "Fixed wake to unlock when the device has never been unlocked" into mnc-dev
Selim Cinek [Sat, 25 Jul 2015 01:48:16 +0000 (01:48 +0000)]
Merge "Fixed wake to unlock when the device has never been unlocked" into mnc-dev

9 years agoFix ambient display
Jorim Jaggi [Fri, 24 Jul 2015 19:32:42 +0000 (12:32 -0700)]
Fix ambient display

Due to a refactoring for touch, wake and unlock for fingerprint
devices PhoneWindowManager now waits for Keyguard to draw its first
frame in all cases, including when screen turns on for pulsing.
However, since in this case the device is not awake, we need to check
for screen on instead of awakeness when proceeding with the wake-up
sequence. Without this change, screen on was blocked forever in the
pulsing case.

Bug: 22605235
Change-Id: Ib6089fd14b673e62347f2c9108d9a6783caa26b7

9 years agoFixed wake to unlock when the device has never been unlocked
Selim Cinek [Sat, 25 Jul 2015 01:15:43 +0000 (18:15 -0700)]
Fixed wake to unlock when the device has never been unlocked

Previously the fingerprint could still unlock the device
when waking up with the fingerprint sensor, since we were not
checking if it is allowed.

Bug: 22622999
Change-Id: I039a4e0701c1f161f227cf6f1d25e8147548db47

9 years agoMerge "BatteryStats: Decode wakeup reasons in Java" into mnc-dev
Adam Lesinski [Sat, 25 Jul 2015 01:14:07 +0000 (01:14 +0000)]
Merge "BatteryStats: Decode wakeup reasons in Java" into mnc-dev

9 years agoMerge "Adapted the behavior when unlocking with fingerprint is not allowed" into...
Selim Cinek [Sat, 25 Jul 2015 00:33:14 +0000 (00:33 +0000)]
Merge "Adapted the behavior when unlocking with fingerprint is not allowed" into mnc-dev

9 years agoCheck for ACCESS_COARSE_LOCATION/ACCESS_FINE_LOCATION
Fyodor Kupolov [Fri, 24 Jul 2015 01:38:10 +0000 (18:38 -0700)]
Check for ACCESS_COARSE_LOCATION/ACCESS_FINE_LOCATION

Call to checkPermission(ACCESS_COARSE_LOCATION) should return
PERMISSION_GRANTED, when package only has ACCESS_FINE_LOCATION permission

Bug: 21852542
Change-Id: I53fe2945784213693f59e7bfccc524276ea8c189

9 years agoAdded the content description for the fingerprint icon
Selim Cinek [Fri, 24 Jul 2015 23:23:23 +0000 (16:23 -0700)]
Added the content description for the fingerprint icon

Added a content description for the fingerprint icon,
which should be used throughout the platform.

Bug: 22616421
Change-Id: I8d65a568af926a692fd6be3e27d40b5d2dd6cbb1

9 years agoAdd filter for personal apps that are not disabled until first use
Zach Johnson [Fri, 24 Jul 2015 22:11:29 +0000 (15:11 -0700)]
Add filter for personal apps that are not disabled until first use

Needed for the battery settings UI.

b/22667081

Change-Id: I25ed5c1866dc3027e450c7ce9031de5def4f839a

9 years agoam 5442932a: am 7b099152: Merge "v22.2.1 support api diff" into mnc-preview-docs
Chris Banes [Fri, 24 Jul 2015 22:41:35 +0000 (22:41 +0000)]
am 5442932a: am 7b099152: Merge "v22.2.1 support api diff" into mnc-preview-docs

* commit '5442932a4befd66394fb155ae95a2eaadd2001a9':
  v22.2.1 support api diff

9 years agoam a65de4fd: am b2f8c716: am 50ed152a: am 7f63ef38: am 9b6a6099: Prevent insanely...
Adrian Roos [Fri, 24 Jul 2015 22:41:26 +0000 (22:41 +0000)]
am a65de4fd: am b2f8c716: am 50ed152a: am 7f63ef38: am 9b6a6099: Prevent insanely long passwords from crashing SystemUI

* commit 'a65de4fde99c84ae7c7cab242e8e1e46ee6c0a5d':
  Prevent insanely long passwords from crashing SystemUI

9 years agoFix bitmap get/set pixels for ALPHA_8
Chris Craik [Fri, 24 Jul 2015 22:17:29 +0000 (15:17 -0700)]
Fix bitmap get/set pixels for ALPHA_8

bug:22724734

Change-Id: If8307854f6bad6fac9ee0b394bf0b044c61183e5

9 years agoAlso check app-ops on path-permissions.
Jeff Sharkey [Fri, 24 Jul 2015 22:10:20 +0000 (15:10 -0700)]
Also check app-ops on path-permissions.

Any place that we check permissions we also need to check any
app-ops associated with those permissions.  In the case of providers
with both <provider> and <path-permission> permissions, track and
report the strongest app-ops denial.

Bug: 22718722
Change-Id: I45e62de39b04d16d071558ad980b701667cfcb9a

9 years agoMerge "Use process state to filter >= UI_HIDDEN" into mnc-dev
John Reck [Fri, 24 Jul 2015 22:15:47 +0000 (22:15 +0000)]
Merge "Use process state to filter >= UI_HIDDEN" into mnc-dev

9 years agoMerge "Fix janky add guest transition" into mnc-dev
Adrian Roos [Fri, 24 Jul 2015 21:42:46 +0000 (21:42 +0000)]
Merge "Fix janky add guest transition" into mnc-dev

9 years agoMerge "Frameworks/base: Hand fingerprint to ART" into mnc-dev
Andreas Gampe [Fri, 24 Jul 2015 21:25:09 +0000 (21:25 +0000)]
Merge "Frameworks/base: Hand fingerprint to ART" into mnc-dev

9 years agoFrameworks/base: Hand fingerprint to ART
Andreas Gampe [Fri, 24 Jul 2015 21:19:44 +0000 (14:19 -0700)]
Frameworks/base: Hand fingerprint to ART

To allow ANR dumps to be symbolized easily, hand the build
fingerprint to the runtime.

Bug: 22693991
Change-Id: Ibd3d3b3bd65dce84acfb97a487807d6f280a9508