Commit Graph

246856 Commits

Author SHA1 Message Date
Chris Craik
bc640cb016 Merge \"Fix framebuffer incomplete errors\" into nyc-dev
am: 4bcf66030d

Change-Id: If578de7d7ea10cceb0e19eb68e305432e4177d04
2016-06-10 16:08:44 +00:00
TreeHugger Robot
4bcf66030d Merge "Fix framebuffer incomplete errors" into nyc-dev 2016-06-10 16:03:22 +00:00
TreeHugger Robot
0f8427773e Merge "fix prefix generation" into nyc-mr1-dev 2016-06-10 16:00:41 +00:00
Adam Lesinski
d499d79b07 Merge \"BatteryStats: Record fine grained battery discharge\" into nyc-dev
am: 094c40b2cc

Change-Id: Ie85fcfc2fa7aec5e7c15f57d605840c563c0e993
2016-06-10 02:21:54 +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
69a983dfec Merge \"BatteryStats: Bump checkin format version to 18\" into nyc-dev
am: d75bc225ac

Change-Id: I70dbac4cb8002d8f216991ca78b18e9c1612eb89
2016-06-10 01:05:03 +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
0505e732da Merge \"Stop magnifying surface insets.\" into nyc-dev
am: 4663b4e806

Change-Id: Id98ea0c13c325d79e5c2ae88184351e75ad7db46
2016-06-10 00:16:44 +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
TreeHugger Robot
ee90bb0b09 Merge "Fix race conditions between Tethering and TetherInterfaceStateMachine" into nyc-mr1-dev 2016-06-09 23:53:55 +00:00
Christopher Tate
ee5bc654a7 Merge \"Don\'t allow restore sessions during backups\" into nyc-dev
am: 9faaf5418a

Change-Id: I68e844ee0710bc4125da7789c2059ab23262ba76
2016-06-09 23:48:44 +00:00
Phil Weaver
d567ae1b87 Merge \"Improve accessibility window title behavior\" into nyc-dev
am: f8af34365c

Change-Id: I620cb3dc270a8ad409ec1760cedd778821fd8d98
2016-06-09 23:41:45 +00:00
TreeHugger Robot
48a71e391e Merge "Ephemeral changes for debug builds" into nyc-mr1-dev 2016-06-09 23:35:03 +00:00
Chris Tate
9faaf5418a Merge "Don't allow restore sessions during backups" into nyc-dev 2016-06-09 23:34:23 +00:00
Doris Liu
ea06280b3e Merge changes from topic 'VectorDrawable polishing cherrypicks from master' into nyc-mr1-dev
* changes:
  Support Keyframe definition for AVD on RT
  Throw Exception for wrong valueType with API guard
2016-06-09 23:33:51 +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
Svet Ganov
08504b5e0d Merge \"Protect the android.intent.action.CALL_PRIVILEGED broadcast\" into nyc-dev
am: c94872e940

Change-Id: I722d5bfbed781c28db5da59f303c2579123d8e6e
2016-06-09 22:52:26 +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
Dianne Hackborn
a2cb7a0ef3 Merge \"Fix more of issue #28689719: Runtime restart\" into nyc-dev
am: 4781525399

Change-Id: I03d781408ef7b0c7c6156d6b63ca0ab4ee457ae1
2016-06-09 22:22:48 +00:00
Todd Kennedy
e2e1ef0581 fix prefix generation
when performing bitwise operations, java promotes byte's to int's.
this is normally okay except when the value is negative. in that
case, java extends the sign bits. this means that after shifting,
all of the upper bits are most likely going to be all f's. instead,
undo the sign extension by pulling out just the 8 bits we're
interested in.

Change-Id: I89f7244f6b675be2cca4a185a7002b5f8a6eece1
2016-06-09 15:22:15 -07:00
Todd Kennedy
af41485757 Ephemeral changes for debug builds
The installer/resolver must typically be specified in a baked in XML
file. But, to aid development, allow the installer/resolver to be
added dynamically on debug builds.

Change-Id: I8617bb2a33a51fc596579bdaadb27a11c3740c14
2016-06-09 15:19:51 -07: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
f252ef9ec1 Merge \"Turn down factory-default lock wallpaper support\" into nyc-dev
am: 52e323bd38

Change-Id: I71646e6fb8a6996c17a9d2760aca88d6927d33ec
2016-06-09 22:13:43 +00:00
Chris Tate
52e323bd38 Merge "Turn down factory-default lock wallpaper support" into nyc-dev 2016-06-09 22:07:00 +00:00
Doris Liu
c9493879d7 Support Keyframe definition for AVD on RT
BUG: 27441613
Change-Id: Iece386f65f3704d1b7caa2b3690a8d3048ccf6e2
2016-06-09 14:40:32 -07:00
Doris Liu
a57e95a6a3 Throw Exception for wrong valueType with API guard
Previously, wrong valueType error is swallowed in jni. As a result,
some animations are quietly skipped without letting developers know.
This CL maintains that behavior for pre-N, and throws Exception
to notify developers of the error for N and above.

Bug: 29009391
Change-Id: I3e8f003cdb97d214da72af3f93a84f64797b1c2c
(cherry picked from commit 94db09917a)
2016-06-09 14:39:18 -07:00
TreeHugger Robot
3e03d02f76 Merge "Add UCE Service Down protected broadcast" into nyc-mr1-dev 2016-06-09 21:30:14 +00:00
Doris Liu
3f6a95283a Merge "Handle hidden RT VectorDrawable animators" into nyc-mr1-dev 2016-06-09 21:30:03 +00:00
Doris Liu
836227b20b Merge "Improve the property modification effiency of VectorDrawable animators" into nyc-mr1-dev 2016-06-09 21:30:03 +00:00
Adam Lesinski
4b9a4a18f9 Merge \"ResourcesManager: Apply ContextThemeWrapper config\" into nyc-dev
am: 9e9c78f8ce

Change-Id: I71250c58f237135d156c64bdc08caafbe5b4a59e
2016-06-09 21:22:34 +00:00
TreeHugger Robot
9e9c78f8ce Merge "ResourcesManager: Apply ContextThemeWrapper config" into nyc-dev 2016-06-09 21:16:03 +00:00
Adam Powell
64e3a6d760 Merge \"Make Activity.getReferrer tolerate custom Parcelables in intents\" into nyc-dev
am: 7a37f8945f

Change-Id: I8e14173836f153d75b9c9f29f3493335af5f2763
2016-06-09 21:05:05 +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
c6bddb8261 Merge \"Cache resources needed to sort media sizes.\" into nyc-dev
am: 142fc425c4

Change-Id: I368ffa5269029801ed191351fb1fff9bde72778a
2016-06-09 20:43:18 +00: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
bf914699d5 Merge \"Don\'t update mTaskToReturnTo when task is cleared\" into nyc-dev
am: 1a77efe9ba

Change-Id: Idb9aad2fb3161552b699f271bed940cb47fd98ad
2016-06-09 20:33:57 +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
Pavlin Radoslavov
7fbbbd5ea1 Unlock mBluetoothLock.readLock() instead of double-locking it
am: 7ee53be300

Change-Id: I521890b2554b47f278f1e3d169b3a3cde825240f
2016-06-09 20:13:44 +00:00
Stuart Scott
aa587546ec Add UCE Service Down protected broadcast
bug:29173516
Change-Id: I1c5743962dbca9c482ce7d87f6fe570a3249f3fe
2016-06-09 12:58:31 -07: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
Robert Carr
c28647084e Merge \"PiP animation: Move window with resize when ending animation.\" into nyc-dev
am: 4624d687f7

Change-Id: Ib9ce0ef71a71e998e1ffe783c178b8f514ab1469
2016-06-09 19:33:19 +00:00