Commit Graph

255075 Commits

Author SHA1 Message Date
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
24cc2cea74 Fixed check for visible volume.
Previously it was checked if the volume was visible to user, but
transient volumes (such as USB drives) are not marked as such.

Fixes: 29174953
Change-Id: I5dbcc42c5b31c6856e01f73815d73482822785d9
2016-06-10 12:10:16 -07:00
Andrew Solovay
d7920dcfcc docs: Updated support library revisions page for 24.0.0
See first comment for doc stage location.

bug: 29215447
Change-Id: Ic3f0aee1d62307b03eecc7ddec0ff7902ead37f2
2016-06-10 11:39:13 -07: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
John Reck
93ff5124c6 Merge \"Don\'t call surfaceCreated for just changed surfaces\" into nyc-dev
am: e4b1fb94e3

Change-Id: I896ffb151a1b6625fe6b6c937dac9b54f1d5d252
2016-06-10 18:02:20 +00: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
Dianne Hackborn
df2485cf48 Merge \"Fix issue #29252997: Should be able to dump only broadcast stats as checkin format\" into nyc-dev
am: 9303ecb317

Change-Id: Ibbb8301975226ada197b2bf07970108a2faac005
2016-06-10 17:49:59 +00: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
3287c5f380 Merge \"Collect statistics of source build version\" into nyc-dev
am: 8872a604b9

Change-Id: I42ceaa3033182e833afbb9d10c65f0d57a8f8591
2016-06-10 17:19:32 +00:00
Chong Zhang
ae15b1331c Merge \"Use user id 0 to get missing appId for debugger\" into nyc-dev
am: 792918e5fd

Change-Id: I4b004cee7f0cdf5ccf2f269e0b0aef8de2eb8741
2016-06-10 17:19:29 +00: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
Chris Craik
7156913021 Merge \"Fix framebuffer incomplete errors\" into nyc-dev
am: 4bcf66030d

Change-Id: I478d99bc0b1f1f10fef38505282711e95b7f5a09
2016-06-10 16:08:38 +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
Adam Lesinski
ae903e100f Merge \"BatteryStats: Record fine grained battery discharge\" into nyc-dev
am: 094c40b2cc

Change-Id: Ia25345a4ae48ad181edb58fd4b5940145ce19107
2016-06-10 02:21:50 +00:00
TreeHugger Robot
094c40b2cc Merge "BatteryStats: Record fine grained battery discharge" into nyc-dev 2016-06-10 02:12:23 +00:00
Adam Lesinski
21b6b2a2d1 Merge \"BatteryStats: Bump checkin format version to 18\" into nyc-dev
am: d75bc225ac

Change-Id: I7341bb190830bead47af780e22d8ed9ee8819384
2016-06-10 01:05:08 +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
Mady Mellor
92b82439c7 Fix shade background not aligning with bottom of a group
The extra padding used to show the shadow at the bottom of a group
was wrongly being subtracted from the shade background causing a
misalignment with the bottom of the group and the shade background.

Change-Id: Ia138fcdcb5428605b59f5448ee125c6b3f3e0d93
Fixes: 29250090
2016-06-09 17:34:43 -07:00
Phil Weaver
e25752e2d2 Merge \"Stop magnifying surface insets.\" into nyc-dev
am: 4663b4e806

Change-Id: I69d56ae38d9445f662ac3564788ad8da382594b6
2016-06-10 00:16:36 +00: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
Christopher Tate
75072f6f18 Merge \"Don\'t allow restore sessions during backups\" into nyc-dev
am: 9faaf5418a

Change-Id: I786bc8d21571fbe456d80b38789fd5e141b3182a
2016-06-09 23:51:02 +00:00
Phil Weaver
e2b3248823 Merge \"Improve accessibility window title behavior\" into nyc-dev
am: f8af34365c

Change-Id: Id9d2de6b82f8e8062c0d66d759440b574b113a02
2016-06-09 23:42:47 +00: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
Svet Ganov
f7a5861c9e Merge \"Protect the android.intent.action.CALL_PRIVILEGED broadcast\" into nyc-dev
am: c94872e940

Change-Id: Ie1e3e6f4e112e40983be6e65ad17ee6e8a5acb55
2016-06-09 22:51:54 +00:00
Svetoslav Ganov
c94872e940 Merge "Protect the android.intent.action.CALL_PRIVILEGED broadcast" into nyc-dev 2016-06-09 22:44:51 +00:00
TreeHugger Robot
606ce981c6 Merge "Settings: add logpersist selection (strings)" into nyc-dev-plus-aosp 2016-06-09 22:26:36 +00:00
Dianne Hackborn
6d8e471072 Merge \"Fix more of issue #28689719: Runtime restart\" into nyc-dev
am: 4781525399

Change-Id: I554724ec2a8198dba1189972dd89ae9edc787162
2016-06-09 22:22:00 +00:00
Dianne Hackborn
4781525399 Merge "Fix more of issue #28689719: Runtime restart" into nyc-dev 2016-06-09 22:16:27 +00:00
Christopher Tate
4676cc96ac Merge \"Turn down factory-default lock wallpaper support\" into nyc-dev
am: 52e323bd38

Change-Id: I53421e5b2626029b3ddb9d987c553a5d42ca3162
2016-06-09 22:13:32 +00:00
Chris Tate
52e323bd38 Merge "Turn down factory-default lock wallpaper support" into nyc-dev 2016-06-09 22:07:00 +00:00
Mark Salyzyn
514ecdf957 Settings: add logpersist selection (strings)
(cherry picked from commit 954ed57091a6471f1873c9954fbb16a4f65a25b5)

Strings for selecting between Off, All and All minus radio to
store logs persistently on the local eMMC device. Strings for
warning button when erasing logpersist data.

Bug: 28936216
Change-Id: I3aaa59a6ebbe1a695490b4a72cad2c807c048985
2016-06-09 15:06:28 -07:00
Adam Lesinski
cdca6fe8a6 Merge \"ResourcesManager: Apply ContextThemeWrapper config\" into nyc-dev
am: 9e9c78f8ce

Change-Id: Id216a87548da2cb2fbc3d4b5dfa7511aa293ccd9
2016-06-09 21:24:09 +00:00