244679 Commits

Author SHA1 Message Date
TreeHugger Robot
7c8360980c Merge "Provide default fallback in theme" into nyc-dev 2016-06-10 21:20:49 +00:00
Sid Soundararajan
7476aaa058 Merge "Recents TV: Add a check for touch enabled mode for starting dismiss animation" into nyc-dev 2016-06-10 20:38:00 +00:00
TreeHugger Robot
cbfc6eed32 Merge "Fixed check for volume name." into nyc-dev 2016-06-10 20:17:33 +00:00
Svetoslav Ganov
4e85376fe1 Merge "Blame only location observers that actually receive updates" into nyc-dev 2016-06-10 19:55:29 +00:00
Jorim Jaggi
b9d28f33fa Provide default fallback in theme
This reverts a part of Ifb724b5c5feea3ed70d68e5bd7615fa91185e743:
Since we enforce the background to be non-translucent, this part
can be reverted and only causes unnecessary regressions.

Change-Id: Ide7b60ee05eb275344fee2f4370f0e8461ef2783
Fixes: 29192742
2016-06-10 19:47:22 +00:00
Eino-Ville Talvala
f4de8dd77c Merge changes I069e2b7e,Ic5e9e58a into nyc-dev
* changes:
  Camera2: Fix error codes for CameraDevice.StateCallback.onError()
  Camera2: Protect MarshalRegistry against concurrent access
2016-06-10 19:44:04 +00:00
TreeHugger Robot
6da2fb61ce Merge "Check for valid paths when getVolumeList() returns invisible volumes." into nyc-dev 2016-06-10 19:38:50 +00:00
Felipe Leme
123a0e712e Check for valid paths when getVolumeList() returns invisible volumes.
The FLAG_INCLUDE_INVISIBLE was created to let SM.getStorageVolumes()
return mounted volumes (like USB drives), but in the current form it
might return invalid volumes. For example, when a SD Card is adopted as
an internal storage, it will return 2 volumes instead of one, the "bad"
one being:

VolumeInfo{emulated}:
     type=EMULATED diskId=null partGuid=null mountFlags=0 mountUserId=-1
     state=UNMOUNTED
     fsType=null fsUuid=null fsLabel=null
     path=null internalPath=null

As such, we need to filter out those volumes that don't have a path.

BUG: 29250241
Change-Id: I3f84b53eac98f31f918d843c70f9d42983e2a438
2016-06-10 11:09:11 -07:00
Felipe Leme
60f8f72cd4 Fixed check for volume name.
There are scenarios - like when an SD Card is adopted as internal
storage - where the getBestVolumeDescription() returns null, in which
case we should use the StorageVolume description instead (or a default
value if such description is also null)>

Change-Id: Ia11c3f4069dfbe252c568210ee60b5d8c384d863
Fixes: 29198046
2016-06-10 11:07:35 -07:00
Sid Soundararajan
6b822694d0 Recents TV: Add a check for touch enabled mode for starting dismiss animation
Fix until we figure out if Gamepad not eating key events during talkback is
inteneded behavior.

BUG: 29208918
Change-Id: Iffe652f10e88d0218875264f31e9d7658d75e71e
2016-06-10 10:59:48 -07:00
John Reck
e4b1fb94e3 Merge "Don't call surfaceCreated for just changed surfaces" into nyc-dev 2016-06-10 17:46:54 +00:00
Dianne Hackborn
9303ecb317 Merge "Fix issue #29252997: Should be able to dump only broadcast stats as checkin format" into nyc-dev 2016-06-10 17:43:14 +00:00
Eino-Ville Talvala
50eebe057b Camera2: Fix error codes for CameraDevice.StateCallback.onError()
Existing code assumed that ICameraDeviceCallbacks and
CameraDevice.StateCallback have the same error code values for matching
errors.

They do not.

Also remove duplicate error code definitions now present in the AIDL
file for ICameraDeviceCallbacks.

Bug: 29248704
Change-Id: I069e2b7ef3be7887634e128f1accb50b7558f3fd
2016-06-10 10:28:34 -07:00
Eino-Ville Talvala
4a2c7c5549 Camera2: Protect MarshalRegistry against concurrent access
Multiple CameraMetadataNative objects could be reading and writing
to the metadata marshaler registry simultaneously.

This can lead to an infinite loop in the HashMap in the worst case,
so add synchronization against this.

Bug: 29043079
Change-Id: Ic5e9e58a9333b99b4bea87bf790c9fbfadfbbea9
2016-06-10 10:28:34 -07:00
Tianjie Xu
8872a604b9 Merge "Collect statistics of source build version" into nyc-dev 2016-06-10 17:13:54 +00:00
Chong Zhang
792918e5fd Merge "Use user id 0 to get missing appId for debugger" into nyc-dev 2016-06-10 17:06:10 +00:00
TreeHugger Robot
4bcf66030d Merge "Fix framebuffer incomplete errors" into nyc-dev 2016-06-10 16:03:22 +00:00
Svet Ganov
e998c73c33 Blame only location observers that actually receive updates
The location manager service keeps update records for all apps
registered to receive location updates. If an app does not have
the location permission then its update record is skipped when
dispatching location updates. However, the battery blame is spread
across all apps requesting location updates even if they don't
receive such because of lacking permission.

bug:28804546

Change-Id: Iee96fd6f304c7a49f9c70484e52abc0ed1538a29
2016-06-10 00:12:41 -07:00
TreeHugger Robot
094c40b2cc Merge "BatteryStats: Record fine grained battery discharge" into nyc-dev 2016-06-10 02:12:23 +00:00
Adam Lesinski
d75bc225ac Merge "BatteryStats: Bump checkin format version to 18" into nyc-dev 2016-06-10 00:53:44 +00:00
Adam Lesinski
b55d741c9a BatteryStats: Bump checkin format version to 18
Bug:28811636
Change-Id: If2229c438e60f20746c91bccbcaa6d72ca5f0802
2016-06-09 17:46:19 -07:00
Adam Lesinski
3ee3f63eb8 BatteryStats: Record fine grained battery discharge
For devices that report battery discharge via a coulomb counter,
record how much of the battery was discharged while the screen
was on/off.

Bug:28743761
Change-Id: Ie2d1708864352029ff466c1fed14fc057e19b93b
2016-06-09 17:37:22 -07:00
Phil Weaver
4663b4e806 Merge "Stop magnifying surface insets." into nyc-dev 2016-06-10 00:08:22 +00:00
Chris Craik
d4fe4d3b30 Fix framebuffer incomplete errors
bug:29127615

Primarily fixes case where 0 dimensioned layers could be
created/updated. Additionally, adds more logging in incomplete
framebuffer cases, if they still occur.

Change-Id: Ib90dbbafd6905aca3c8f46e64064e13a308f713d
2016-06-09 17:05:27 -07:00
Dianne Hackborn
f73bd84ed7 Fix issue #29252997: Should be able to dump only broadcast stats as checkin format
Change-Id: I36d4e5e20ff2ed1b4d02a04390e0415b9b2394a3
2016-06-09 16:58:45 -07:00
Chong Zhang
d25944e120 Use user id 0 to get missing appId for debugger
When forceStopPackageLocked is used to kill existing app process for
relaunching with debugger, user id could be -1 and getPackageUid will
already return -1. This results in killPackageProcessesLocked() not
able to find and kill the app, and wait for debugger will.

This also revert commit 55c9d739 (ag/969408) which tried to fix the
same problem but got it wrong. It's valid to -D when the process is
already running, as we're supposed to kill it. The really problem is
that the killing fails because of bad appId.

bug: 28980761
Change-Id: Ibebdcc26865464216a1f4b6773e540921cdad7d2
2016-06-09 16:38:51 -07:00
Chris Tate
9faaf5418a Merge "Don't allow restore sessions during backups" into nyc-dev 2016-06-09 23:34:23 +00:00
Phil Weaver
f8af34365c Merge "Improve accessibility window title behavior" into nyc-dev 2016-06-09 23:32:10 +00:00
Christopher Tate
09893e9a41 Don't allow restore sessions during backups
Gracefully no-op if apps attempt to restore themselves while there is
a backup pass in flight.

Bug 29135379

Change-Id: I8f0b5cd9d149b703e1de7a3a0b4b54c3aff766b6
2016-06-09 16:28:26 -07:00
John Reck
208c47cfb0 Don't call surfaceCreated for just changed surfaces
Fixes: 29223302

If the surface only changed we want to just call onSurfaceChanged,
not onSurfaceCreated.

Change-Id: I65c8b210a7e34eaa2862020335ee7f6ef56eeac2
2016-06-09 16:26:21 -07:00
Tianjie Xu
c1ff246f1a Collect statistics of source build version
Parse the last_install and report the source build version of an ota
update.
Related CL in: ag/1121141

Bug: 28658632
Change-Id: I5e835c144aabe97fda681f60397ebf4416f7bd4f
2016-06-09 16:00:11 -07:00
Svetoslav Ganov
c94872e940 Merge "Protect the android.intent.action.CALL_PRIVILEGED broadcast" into nyc-dev 2016-06-09 22:44:51 +00:00
Dianne Hackborn
4781525399 Merge "Fix more of issue #28689719: Runtime restart" into nyc-dev 2016-06-09 22:16:27 +00:00
Chris Tate
52e323bd38 Merge "Turn down factory-default lock wallpaper support" into nyc-dev 2016-06-09 22:07:00 +00:00
TreeHugger Robot
9e9c78f8ce Merge "ResourcesManager: Apply ContextThemeWrapper config" into nyc-dev 2016-06-09 21:16:03 +00:00
TreeHugger Robot
7a37f8945f Merge "Make Activity.getReferrer tolerate custom Parcelables in intents" into nyc-dev 2016-06-09 20:57:53 +00:00
Christopher Tate
36cb2a7a91 Turn down factory-default lock wallpaper support
The infrastructure is here but not yet fully plumbed, so gracefully
provide the historical behavior until the rest is in place.

Bug 29220492

Change-Id: I36feaf68099d85e4ae11a5262002ee85346703ed
2016-06-09 13:47:19 -07:00
Phil Weaver
155edc693e Improve accessibility window title behavior
Un-reverts ag/1057448, but uses a version of Resources#getText
that returns null rather than throw an exception when no title
is available. This is the same call made before, so this change
should be safer.

Bug: 28744278
Change-Id: I8c123f4f6d74f796ab9e8ffcf955aaf881770da1
2016-06-09 13:45:46 -07:00
Philip P. Moltmann
142fc425c4 Merge "Cache resources needed to sort media sizes." into nyc-dev 2016-06-09 20:35:59 +00:00
Andrii Kulian
1a77efe9ba Merge "Don't update mTaskToReturnTo when task is cleared" into nyc-dev 2016-06-09 20:27:29 +00:00
Dianne Hackborn
41bfaf870e Fix more of issue #28689719: Runtime restart
Change-Id: I0cce1cef884cf1508f1e726ea3439a5ffee84993
2016-06-09 12:58:25 -07:00
Pavlin Radoslavov
7ee53be300 Unlock mBluetoothLock.readLock() instead of double-locking it
Bug: 29011117
Change-Id: Ie9e359c3ee079c2cecc33f11cfff7c0dc6406be1
2016-06-09 12:58:07 -07:00
Adam Lesinski
c1b0ebf579 ResourcesManager: Apply ContextThemeWrapper config
The ContextThemeWrapper's configuration override must also
be applied to ResourcesManager during a configuration change.

Bug:27644297
Change-Id: Ic126308b753979c18801d422a8243aa4daf45147
2016-06-09 12:57:45 -07:00
Adam Powell
d3c63a66f2 Make Activity.getReferrer tolerate custom Parcelables in intents
Referrer information is passed as an intent extra to each Activity,
therefore if that intent contains a custom parcelable unmarshaling
the intent extras will fail in a call to getReferrer. Insulate apps
from this concern and log a warning when it happens.

Bug 28972438

Change-Id: I37dbc033bfcfe816e4b58b382c012854fbed943b
2016-06-09 12:36:16 -07:00
TreeHugger Robot
4624d687f7 Merge "PiP animation: Move window with resize when ending animation." into nyc-dev 2016-06-09 19:28:11 +00:00
Philip P. Moltmann
5398f2731b Merge "Handling of Fuji Xerox in RecommendationService." into nyc-dev 2016-06-09 19:24:05 +00:00
Andrii Kulian
4b7f2d46be Don't update mTaskToReturnTo when task is cleared
If activity launch has moved other task that was over home while
clearing task - don't override its mTaskToReturnTo not to loose
the original value of other task.

Bug: 28986980
Change-Id: Ib1680769fbb8a8d99f2b210c8d9cd8fe6fd5a196
2016-06-09 11:46:23 -07:00
Eric Schmidt
b1a99c46b6 Merge \\"docs: Added links to performance resources section\\" into mnc-io-docs am: e4b1149320
am: 2dea7d3836

Change-Id: I73d48da51be02656ae636686b42253c35ebc3762
2016-06-09 17:56:38 +00:00
Eric Schmidt
2dea7d3836 Merge \"docs: Added links to performance resources section\" into mnc-io-docs
am: e4b1149320

Change-Id: Ib1fa097035dce4d6e4c55ac6d87aa26bacceade8
2016-06-09 17:45:53 +00:00
Eric Schmidt
e4b1149320 Merge "docs: Added links to performance resources section" into mnc-io-docs 2016-06-09 17:37:26 +00:00