OSDN Git Service

android-x86/frameworks-base.git
8 years agoMerge "Handle empty/unspecified crop properly in wallpaper restore" into nyc-mr1...
Christopher Tate [Tue, 9 Aug 2016 00:51:16 +0000 (00:51 +0000)]
Merge "Handle empty/unspecified crop properly in wallpaper restore" into nyc-mr1-dev am: 0b26adbb8b
am: c32929ab1a

Change-Id: I5713bd059a0fa6c5ed49cd5523082263bf17e19b

8 years agoHandle empty/unspecified crop properly in wallpaper restore am: dd7110db2b
Christopher Tate [Tue, 9 Aug 2016 00:51:08 +0000 (00:51 +0000)]
Handle empty/unspecified crop properly in wallpaper restore am: dd7110db2b
am: 2ba9127494

Change-Id: I7644603b3ff7dcbd0c9b43cc170da19172949d15

8 years agoMerge "Mark wallpaper as backupInForeground="true"" into nyc-mr1-dev am: d5b0b9bb1f
Christopher Tate [Tue, 9 Aug 2016 00:43:33 +0000 (00:43 +0000)]
Merge "Mark wallpaper as backupInForeground="true"" into nyc-mr1-dev am: d5b0b9bb1f
am: dacbfeaa4c

Change-Id: Icfd874132ee26287e7d1b3e8e40ec9e1897a19a1

8 years agoMark wallpaper as backupInForeground="true" am: 8f4c82691a
Christopher Tate [Tue, 9 Aug 2016 00:43:29 +0000 (00:43 +0000)]
Mark wallpaper as backupInForeground="true" am: 8f4c82691a
am: 641bd536e3

Change-Id: I3b2ceb7646a3332998782bf8bffff34e2c98191e

8 years agoMerge "Handle empty/unspecified crop properly in wallpaper restore" into nyc-mr1-dev
Christopher Tate [Tue, 9 Aug 2016 00:43:18 +0000 (00:43 +0000)]
Merge "Handle empty/unspecified crop properly in wallpaper restore" into nyc-mr1-dev
am: 0b26adbb8b

Change-Id: Ic7b8e2dc5bf39553b1036fad8e871b5fdb51c74f

8 years agoHandle empty/unspecified crop properly in wallpaper restore
Christopher Tate [Tue, 9 Aug 2016 00:43:16 +0000 (00:43 +0000)]
Handle empty/unspecified crop properly in wallpaper restore
am: dd7110db2b

Change-Id: I501a5e30a1b204436e722d363709d3d35d430d91

8 years agoMerge "Mark wallpaper as backupInForeground="true"" into nyc-mr1-dev
Christopher Tate [Tue, 9 Aug 2016 00:37:12 +0000 (00:37 +0000)]
Merge "Mark wallpaper as backupInForeground="true"" into nyc-mr1-dev
am: d5b0b9bb1f

Change-Id: I7c12efa23f81cad90cad9735c54c80fbdd4641dd

8 years agoMark wallpaper as backupInForeground="true"
Christopher Tate [Tue, 9 Aug 2016 00:37:10 +0000 (00:37 +0000)]
Mark wallpaper as backupInForeground="true"
am: 8f4c82691a

Change-Id: Idf7e60a44496584075a8f8f7b7958278f65439e3

8 years agoMerge "Handle empty/unspecified crop properly in wallpaper restore" into nyc-mr1-dev
TreeHugger Robot [Tue, 9 Aug 2016 00:34:07 +0000 (00:34 +0000)]
Merge "Handle empty/unspecified crop properly in wallpaper restore" into nyc-mr1-dev

8 years agoMerge "Mark wallpaper as backupInForeground="true"" into nyc-mr1-dev
TreeHugger Robot [Tue, 9 Aug 2016 00:24:04 +0000 (00:24 +0000)]
Merge "Mark wallpaper as backupInForeground="true"" into nyc-mr1-dev

8 years agoMerge "Merge "docs: Revised "Optimizing Content for the Assistant" page." into nyc...
Kevin Hufnagle [Tue, 9 Aug 2016 00:10:14 +0000 (00:10 +0000)]
Merge "Merge "docs: Revised "Optimizing Content for the Assistant" page." into nyc-dev am: 87c2ed97b8" into nyc-mr1-dev am: 0402936230
am: b5f0030c36

Change-Id: I23aeb14b55c0fcf45dbdea404f48ddc11eaa65f0

8 years agoMerge "docs: Revised "Optimizing Content for the Assistant" page." into nyc-dev am...
Kevin Hufnagle [Tue, 9 Aug 2016 00:07:25 +0000 (00:07 +0000)]
Merge "docs: Revised "Optimizing Content for the Assistant" page." into nyc-dev am: 87c2ed97b8 am: 70f8ca8dff
am: 3ded4c5774

Change-Id: Id365a643e1ce22e82b090158cdc5456a1a3ae4ab

8 years agoMerge "docs: Revised "Optimizing Content for the Assistant" page. am: d4197234bb...
Kevin Hufnagle [Tue, 9 Aug 2016 00:07:16 +0000 (00:07 +0000)]
Merge "docs: Revised "Optimizing Content for the Assistant" page. am: d4197234bb" into nyc-mr1-dev am: fc9f55873a
am: 7c2d0c77a6

Change-Id: I68a73741db3c9c425588eea690aba788e0118fbf

8 years agodocs: Revised "Optimizing Content for the Assistant" page. am: d4197234bb am: 7a13b16dcf
Kevin Hufnagle [Tue, 9 Aug 2016 00:07:08 +0000 (00:07 +0000)]
docs: Revised "Optimizing Content for the Assistant" page. am: d4197234bb am: 7a13b16dcf
am: bbedca69e5

Change-Id: I5ca865bfe0c5c9302a930c91d770255bda224914

8 years agoMerge "Prevent EndLayerOps when Begin was rejected" into nyc-mr1-dev am: a9bef43149
Chris Craik [Tue, 9 Aug 2016 00:06:59 +0000 (00:06 +0000)]
Merge "Prevent EndLayerOps when Begin was rejected" into nyc-mr1-dev am: a9bef43149
am: bbc56855bd

Change-Id: I849382d12a565727f77240eda247e1e98ca3892c

8 years agoPrevent EndLayerOps when Begin was rejected am: 3c53ec51ef
Chris Craik [Tue, 9 Aug 2016 00:06:51 +0000 (00:06 +0000)]
Prevent EndLayerOps when Begin was rejected am: 3c53ec51ef
am: 152f76ee50

Change-Id: Id942f3b0495a4e3c9eb7aa6d8647987e72ddb77a

8 years agoMerge "Merge "docs: Revised "Optimizing Content for the Assistant" page." into nyc...
Kevin Hufnagle [Mon, 8 Aug 2016 23:57:44 +0000 (23:57 +0000)]
Merge "Merge "docs: Revised "Optimizing Content for the Assistant" page." into nyc-dev am: 87c2ed97b8" into nyc-mr1-dev
am: 0402936230

Change-Id: Idb74051cc189752d2262ed0d49a483199a30c674

8 years agoMerge "docs: Revised "Optimizing Content for the Assistant" page." into nyc-dev am...
Kevin Hufnagle [Mon, 8 Aug 2016 23:57:42 +0000 (23:57 +0000)]
Merge "docs: Revised "Optimizing Content for the Assistant" page." into nyc-dev am: 87c2ed97b8
am: 70f8ca8dff

Change-Id: I8259ec45647b0ac035255ca8e3539fd4d1fe96c5

8 years agoMerge "docs: Revised "Optimizing Content for the Assistant" page. am: d4197234bb...
Kevin Hufnagle [Mon, 8 Aug 2016 23:57:34 +0000 (23:57 +0000)]
Merge "docs: Revised "Optimizing Content for the Assistant" page. am: d4197234bb" into nyc-mr1-dev
am: fc9f55873a

Change-Id: Ifeca3dd4f1a3bfb9f77639c4ee02e0115888bedf

8 years agodocs: Revised "Optimizing Content for the Assistant" page. am: d4197234bb
Kevin Hufnagle [Mon, 8 Aug 2016 23:57:31 +0000 (23:57 +0000)]
docs: Revised "Optimizing Content for the Assistant" page. am: d4197234bb
am: 7a13b16dcf

Change-Id: I484b8dba5b6dee2a15aa9dfad09b300761b1766e

8 years agoMerge "docs: Revised "Optimizing Content for the Assistant" page." into nyc-dev am...
Kevin Hufnagle [Mon, 8 Aug 2016 23:57:28 +0000 (23:57 +0000)]
Merge "docs: Revised "Optimizing Content for the Assistant" page." into nyc-dev am: 87c2ed97b8
am: 71b45d25df

Change-Id: I61828e5c4c0ca5386bba0789fadb1a927d29b2ec

8 years agodocs: Revised "Optimizing Content for the Assistant" page. am: d4197234bb
Kevin Hufnagle [Mon, 8 Aug 2016 23:57:26 +0000 (23:57 +0000)]
docs: Revised "Optimizing Content for the Assistant" page. am: d4197234bb
am: 5d9f0520cb

Change-Id: I1a3de5fd2c50fc8071db932aaac697b6611c069d

8 years agoMerge "Prevent EndLayerOps when Begin was rejected" into nyc-mr1-dev
Chris Craik [Mon, 8 Aug 2016 23:57:24 +0000 (23:57 +0000)]
Merge "Prevent EndLayerOps when Begin was rejected" into nyc-mr1-dev
am: a9bef43149

Change-Id: Ie5049628f5e2f6f1e5baec0db92be30d3b1e2855

8 years agoPrevent EndLayerOps when Begin was rejected
Chris Craik [Mon, 8 Aug 2016 23:57:22 +0000 (23:57 +0000)]
Prevent EndLayerOps when Begin was rejected
am: 3c53ec51ef

Change-Id: I075b68a1b7bdee4cbebd734748dd485ff6cd67b3

8 years agoMerge "Merge "docs: Revised "Optimizing Content for the Assistant" page." into nyc...
Android Build Merger (Role) [Mon, 8 Aug 2016 23:49:29 +0000 (23:49 +0000)]
Merge "Merge "docs: Revised "Optimizing Content for the Assistant" page." into nyc-dev am: 87c2ed97b8" into nyc-mr1-dev

8 years agoMerge "docs: Revised "Optimizing Content for the Assistant" page. am: d4197234bb...
Android Build Merger (Role) [Mon, 8 Aug 2016 23:49:18 +0000 (23:49 +0000)]
Merge "docs: Revised "Optimizing Content for the Assistant" page. am: d4197234bb" into nyc-mr1-dev

8 years agoMerge "docs: Revised "Optimizing Content for the Assistant" page." into nyc-dev
Kevin Hufnagle [Mon, 8 Aug 2016 23:48:52 +0000 (23:48 +0000)]
Merge "docs: Revised "Optimizing Content for the Assistant" page." into nyc-dev
am: 87c2ed97b8

Change-Id: I48f91ef763f6591e16751d9ae8fd9d86be277111

8 years agodocs: Revised "Optimizing Content for the Assistant" page.
Kevin Hufnagle [Mon, 8 Aug 2016 23:48:50 +0000 (23:48 +0000)]
docs: Revised "Optimizing Content for the Assistant" page.
am: d4197234bb

Change-Id: Ie85273ed977c06e9b82a77d66a7333e9eca86e10

8 years agoMerge "docs: Revised "Optimizing Content for the Assistant" page." into nyc-dev
Kevin Hufnagle [Mon, 8 Aug 2016 23:48:16 +0000 (23:48 +0000)]
Merge "docs: Revised "Optimizing Content for the Assistant" page." into nyc-dev
am: 87c2ed97b8

Change-Id: If031e6c264ecaf23b32b62ac8d0e1036959d242d

8 years agodocs: Revised "Optimizing Content for the Assistant" page.
Kevin Hufnagle [Mon, 8 Aug 2016 23:48:12 +0000 (23:48 +0000)]
docs: Revised "Optimizing Content for the Assistant" page.
am: d4197234bb

Change-Id: Iee3f043360bfd8df55265481843e165d1ffc832c

8 years agoMerge "Prevent EndLayerOps when Begin was rejected" into nyc-mr1-dev
Chris Craik [Mon, 8 Aug 2016 23:44:07 +0000 (23:44 +0000)]
Merge "Prevent EndLayerOps when Begin was rejected" into nyc-mr1-dev

8 years agoMerge "docs: Revised "Optimizing Content for the Assistant" page." into nyc-dev
Kevin Hufnagle [Mon, 8 Aug 2016 23:35:25 +0000 (23:35 +0000)]
Merge "docs: Revised "Optimizing Content for the Assistant" page." into nyc-dev

8 years agoMerge "ShortcutManager improve app udpate check" into nyc-mr1-dev am: 369c6ebf02
Makoto Onuki [Mon, 8 Aug 2016 23:27:36 +0000 (23:27 +0000)]
Merge "ShortcutManager improve app udpate check" into nyc-mr1-dev am: 369c6ebf02
am: 4684672789

Change-Id: I02d89a8eb5e626d7e6ec2933e178ea52e0a68109

8 years agoShortcutManager improve app udpate check am: 64183d5188
Makoto Onuki [Mon, 8 Aug 2016 23:27:33 +0000 (23:27 +0000)]
ShortcutManager improve app udpate check am: 64183d5188
am: bb5db91bf3

Change-Id: I3c8f413dffece083824e5959b5bd167a0a78d2c9

8 years agodocs: fixed generics in data binding code samples am: b1b5efd3be am: 7f703bde72 am...
Mark Lu [Mon, 8 Aug 2016 23:21:01 +0000 (23:21 +0000)]
docs: fixed generics in data binding code samples am: b1b5efd3be am: 7f703bde72 am: 66847abba6
am: ee0c57417b

Change-Id: I7692ef0a4053cf8220e9b5ec11004b2162f2148c

8 years agoMerge "Fix bug where foreground activity fails to cancel auth/enrollment" into nyc...
Jim Miller [Mon, 8 Aug 2016 23:20:58 +0000 (23:20 +0000)]
Merge "Fix bug where foreground activity fails to cancel auth/enrollment" into nyc-mr1-dev am: 6cb5152e9f
am: fb5ae0abff

Change-Id: Icfc434168cb3aae52f234b67f0dff087dee3a41b

8 years agoFix bug where foreground activity fails to cancel auth/enrollment am: 37979c9db0
Jim Miller [Mon, 8 Aug 2016 23:20:54 +0000 (23:20 +0000)]
Fix bug where foreground activity fails to cancel auth/enrollment am: 37979c9db0
am: b08d7677d7

Change-Id: Id5ad561221cfcb6999ec9cea560b4654ff8696ab

8 years agoMerge "ShortcutManager improve app udpate check" into nyc-mr1-dev
Makoto Onuki [Mon, 8 Aug 2016 23:20:45 +0000 (23:20 +0000)]
Merge "ShortcutManager improve app udpate check" into nyc-mr1-dev
am: 369c6ebf02

Change-Id: I58aa77cec332d449ec763681e871a79af27e4597

8 years agoShortcutManager improve app udpate check
Makoto Onuki [Mon, 8 Aug 2016 23:20:44 +0000 (23:20 +0000)]
ShortcutManager improve app udpate check
am: 64183d5188

Change-Id: I0d5325d861ad52b186f2c7c9c106f485200fb826

8 years agoHandle empty/unspecified crop properly in wallpaper restore
Christopher Tate [Mon, 8 Aug 2016 20:09:02 +0000 (13:09 -0700)]
Handle empty/unspecified crop properly in wallpaper restore

Pass 'null' as the crop hint when the crop as expressed in the restored
wallpaper metadata is either unspecified or effectively empty.

Bug 30521402
Bug 30274136

Change-Id: I14e5d2bae1ec30fb27e8fd45b340b2ca87f35a01

8 years agodocs: fixed generics in data binding code samples am: b1b5efd3be am: 7f703bde72
Mark Lu [Mon, 8 Aug 2016 23:12:13 +0000 (23:12 +0000)]
docs: fixed generics in data binding code samples am: b1b5efd3be am: 7f703bde72
am: 66847abba6

Change-Id: If061ef027bb10d651e1b90294b1cdd116fe7b05b

8 years agoMerge "Fix bug where foreground activity fails to cancel auth/enrollment" into nyc...
Jim Miller [Mon, 8 Aug 2016 23:12:08 +0000 (23:12 +0000)]
Merge "Fix bug where foreground activity fails to cancel auth/enrollment" into nyc-mr1-dev
am: 6cb5152e9f

Change-Id: Iae245cedd050379b6aad1f807e3d9b71dca221c3

8 years agoFix bug where foreground activity fails to cancel auth/enrollment
Jim Miller [Mon, 8 Aug 2016 23:12:03 +0000 (23:12 +0000)]
Fix bug where foreground activity fails to cancel auth/enrollment
am: 37979c9db0

Change-Id: I486f40d728e2b4bd359c617f31a9032efc6e022b

8 years agoMerge "docs: add info to SharedPreferences.Editor.putString" into nyc-dev am: a6ee9c1...
Mark Lu [Mon, 8 Aug 2016 23:07:46 +0000 (23:07 +0000)]
Merge "docs: add info to SharedPreferences.Editor.putString" into nyc-dev am: a6ee9c1848 am: 325399bfb9
am: 6fadcab88a

Change-Id: Ie0448301e7dc6b0abf3ffe54faea827fe350a944

8 years agodocs: add info to SharedPreferences.Editor.putString am: fb48521f41 am: 9bc63b9bf0
Mark Lu [Mon, 8 Aug 2016 23:07:43 +0000 (23:07 +0000)]
docs: add info to SharedPreferences.Editor.putString am: fb48521f41 am: 9bc63b9bf0
am: 3e3e19d3c8

Change-Id: I19a77e2c8e9998ab02b58a1444c5a12b8ea33b43

8 years agoMerge "Reverting ag/1288123" into nyc-mr1-dev am: d983386c31
Winson Chung [Mon, 8 Aug 2016 23:07:38 +0000 (23:07 +0000)]
Merge "Reverting ag/1288123" into nyc-mr1-dev am: d983386c31
am: 9bc4d36796

Change-Id: I89db474b4dc0953291a403a6f35f667f5bbab23b

8 years agoReverting ag/1288123 am: 08deff0a67
Winson [Mon, 8 Aug 2016 23:07:35 +0000 (23:07 +0000)]
Reverting ag/1288123 am: 08deff0a67
am: 5ce0a4fb0f

Change-Id: I5ee92797463b32c5f32d109b0ad354498893fd46

8 years agodocs: fixed generics in data binding code samples am: b1b5efd3be am: 7f703bde72
Mark Lu [Mon, 8 Aug 2016 23:01:49 +0000 (23:01 +0000)]
docs: fixed generics in data binding code samples am: b1b5efd3be am: 7f703bde72
am: cd94572f82

Change-Id: I8bbc9ca66de15b5d2f6be7cde962721d7db78f68

8 years agoMerge "ShortcutManager improve app udpate check" into nyc-mr1-dev
TreeHugger Robot [Mon, 8 Aug 2016 23:01:42 +0000 (23:01 +0000)]
Merge "ShortcutManager improve app udpate check" into nyc-mr1-dev

8 years agoMerge "docs: add info to SharedPreferences.Editor.putString" into nyc-dev am: a6ee9c1848
Mark Lu [Mon, 8 Aug 2016 23:00:15 +0000 (23:00 +0000)]
Merge "docs: add info to SharedPreferences.Editor.putString" into nyc-dev am: a6ee9c1848
am: 325399bfb9

Change-Id: I5105164ff30ea9a285e4e22325ef5c2baa433eeb

8 years agodocs: add info to SharedPreferences.Editor.putString am: fb48521f41
Mark Lu [Mon, 8 Aug 2016 23:00:12 +0000 (23:00 +0000)]
docs: add info to SharedPreferences.Editor.putString am: fb48521f41
am: 9bc63b9bf0

Change-Id: I59a010b5d4d2859ed64cf1ef0684b92ebb9d60d6

8 years agoMerge "Reverting ag/1288123" into nyc-mr1-dev
Winson Chung [Mon, 8 Aug 2016 23:00:10 +0000 (23:00 +0000)]
Merge "Reverting ag/1288123" into nyc-mr1-dev
am: d983386c31

Change-Id: Idd7551d5e95ad542edcc2c6c310163ca6c20d74c

8 years agodocs: fixed generics in data binding code samples am: b1b5efd3be
Mark Lu [Mon, 8 Aug 2016 23:00:09 +0000 (23:00 +0000)]
docs: fixed generics in data binding code samples am: b1b5efd3be
am: 7f703bde72

Change-Id: Ibc12639849de4edcbcfdaa1c0f543d6f2eb868f8

8 years agoReverting ag/1288123
Winson [Mon, 8 Aug 2016 23:00:07 +0000 (23:00 +0000)]
Reverting ag/1288123
am: 08deff0a67

Change-Id: I13bdc80c790dc1563f6839a98d6dbfce283a2baa

8 years agoMerge "Fix bug where foreground activity fails to cancel auth/enrollment" into nyc...
TreeHugger Robot [Mon, 8 Aug 2016 22:55:04 +0000 (22:55 +0000)]
Merge "Fix bug where foreground activity fails to cancel auth/enrollment" into nyc-mr1-dev

8 years agoMerge "docs: add info to SharedPreferences.Editor.putString" into nyc-dev am: a6ee9c1848
Mark Lu [Mon, 8 Aug 2016 22:49:16 +0000 (22:49 +0000)]
Merge "docs: add info to SharedPreferences.Editor.putString" into nyc-dev am: a6ee9c1848
am: 65a4e23b66

Change-Id: I75c1808758a767eb7028d312b0542f2175a55a51

8 years agodocs: fixed generics in data binding code samples am: b1b5efd3be
Mark Lu [Mon, 8 Aug 2016 22:49:14 +0000 (22:49 +0000)]
docs: fixed generics in data binding code samples am: b1b5efd3be
am: 7f703bde72

Change-Id: Ibdc351bc38832d8e0f02332be8aa1802e6c3ae65

8 years agodocs: add info to SharedPreferences.Editor.putString am: fb48521f41
Mark Lu [Mon, 8 Aug 2016 22:49:12 +0000 (22:49 +0000)]
docs: add info to SharedPreferences.Editor.putString am: fb48521f41
am: f434456ba5

Change-Id: I5dec6b6fb20c741d92a840cf6291d0b33ac46d5a

8 years agoMerge "docs: add info to SharedPreferences.Editor.putString" into nyc-dev
Mark Lu [Mon, 8 Aug 2016 22:49:11 +0000 (22:49 +0000)]
Merge "docs: add info to SharedPreferences.Editor.putString" into nyc-dev
am: a6ee9c1848

Change-Id: Ief38c0b6b1b61e8fcc060224c298fb3a4711cc94

8 years agodocs: add info to SharedPreferences.Editor.putString
Mark Lu [Mon, 8 Aug 2016 22:49:08 +0000 (22:49 +0000)]
docs: add info to SharedPreferences.Editor.putString
am: fb48521f41

Change-Id: I948c8091a70180e29a601d6cba40d7fb0cf2d76a

8 years agodocs: fixed generics in data binding code samples
Mark Lu [Mon, 8 Aug 2016 22:37:19 +0000 (22:37 +0000)]
docs: fixed generics in data binding code samples
am: b1b5efd3be

Change-Id: Iecafea06866a4579824435467c5dd31859c0dbd4

8 years agoMerge "docs: add info to SharedPreferences.Editor.putString" into nyc-dev
Mark Lu [Mon, 8 Aug 2016 22:36:19 +0000 (22:36 +0000)]
Merge "docs: add info to SharedPreferences.Editor.putString" into nyc-dev
am: a6ee9c1848

Change-Id: Id2540d8e557f2793d3e00a667c26b4efef49a3fc

8 years agodocs: add info to SharedPreferences.Editor.putString
Mark Lu [Mon, 8 Aug 2016 22:36:09 +0000 (22:36 +0000)]
docs: add info to SharedPreferences.Editor.putString
am: fb48521f41

Change-Id: Icf8a1a92e8f18bcc63b52842ea75b00610feac9d

8 years agoMerge "Reverting ag/1288123" into nyc-mr1-dev
Winson Chung [Mon, 8 Aug 2016 22:33:58 +0000 (22:33 +0000)]
Merge "Reverting ag/1288123" into nyc-mr1-dev

8 years agoMerge "docs: add info to SharedPreferences.Editor.putString" into nyc-dev
Mark Lu [Mon, 8 Aug 2016 22:26:34 +0000 (22:26 +0000)]
Merge "docs: add info to SharedPreferences.Editor.putString" into nyc-dev

8 years agoPrevent EndLayerOps when Begin was rejected
Chris Craik [Mon, 8 Aug 2016 22:15:57 +0000 (15:15 -0700)]
Prevent EndLayerOps when Begin was rejected

bug:30537130

BeginLayerOps were being rejected in a way that allowed the associated
EndLayerOps to still be recorded. This was a violation of DisplayList
content expectations, and caused crashes in FrameBuilder when trying to
play these DisplayLists back.

Change-Id: I531b840aa5c4ffb1ee458da3f4b366978eaeafbe

8 years agoMerge "Merge "Fix currentAnimationTimeMillis to use vsync time" into nyc-mr1-dev...
Android Build Merger (Role) [Mon, 8 Aug 2016 22:15:31 +0000 (22:15 +0000)]
Merge "Merge "Fix currentAnimationTimeMillis to use vsync time" into nyc-mr1-dev am: 8bcd5bc5b0 am: 4ea119f3b9" into nyc-mr1-dev-plus-aosp

8 years agoMerge "Fix currentAnimationTimeMillis to use vsync time am: a2acb4f077 am: 936166fd5b...
Android Build Merger (Role) [Mon, 8 Aug 2016 22:15:14 +0000 (22:15 +0000)]
Merge "Fix currentAnimationTimeMillis to use vsync time am: a2acb4f077 am: 936166fd5b" into nyc-mr1-dev-plus-aosp

8 years agoMerge "Fix currentAnimationTimeMillis to use vsync time" into nyc-mr1-dev am: 8bcd5bc5b0
John Reck [Mon, 8 Aug 2016 22:14:51 +0000 (22:14 +0000)]
Merge "Fix currentAnimationTimeMillis to use vsync time" into nyc-mr1-dev am: 8bcd5bc5b0
am: 4ea119f3b9

Change-Id: Ib82f164a0c7e3cc1caf9057766cbffb168d9607f

8 years agoFix currentAnimationTimeMillis to use vsync time am: a2acb4f077
John Reck [Mon, 8 Aug 2016 22:14:47 +0000 (22:14 +0000)]
Fix currentAnimationTimeMillis to use vsync time am: a2acb4f077
am: 936166fd5b

Change-Id: I1ce809bb9ac8adb19f8c9112a92f97beff8a2ce2

8 years agoMerge "fix safeMode status in AppWidgetService" am: 78a72f0698 am: cbd4ad1f7e
joonyoung.cho [Mon, 8 Aug 2016 22:14:43 +0000 (22:14 +0000)]
Merge "fix safeMode status in AppWidgetService" am: 78a72f0698 am: cbd4ad1f7e
am: 5a3034f8ff

Change-Id: Iaefa29636ecc0367c3ad40d06a5e2099c9e506f4

8 years agoMerge "Fix currentAnimationTimeMillis to use vsync time" into nyc-mr1-dev
John Reck [Mon, 8 Aug 2016 22:04:50 +0000 (22:04 +0000)]
Merge "Fix currentAnimationTimeMillis to use vsync time" into nyc-mr1-dev
am: 8bcd5bc5b0

Change-Id: I660aa6ba9a73788f65fcc9655fdc48cb1b0ef2b5

8 years agoFix currentAnimationTimeMillis to use vsync time
John Reck [Mon, 8 Aug 2016 22:04:48 +0000 (22:04 +0000)]
Fix currentAnimationTimeMillis to use vsync time
am: a2acb4f077

Change-Id: Id70516e3444441ed16afbf658e8a446333eb32ff

8 years agoMerge "fix safeMode status in AppWidgetService" am: 78a72f0698
joonyoung.cho [Mon, 8 Aug 2016 22:01:29 +0000 (22:01 +0000)]
Merge "fix safeMode status in AppWidgetService" am: 78a72f0698
am: cbd4ad1f7e

Change-Id: I879ba624b3d3693472e6623e084660d4cadf6b95

8 years agoMerge "fix safeMode status in AppWidgetService"
joonyoung.cho [Mon, 8 Aug 2016 21:53:34 +0000 (21:53 +0000)]
Merge "fix safeMode status in AppWidgetService"
am: 78a72f0698

Change-Id: I21559690f6371102cf48132d8930343923d60011

8 years agoMerge "Fix currentAnimationTimeMillis to use vsync time" into nyc-mr1-dev
John Reck [Mon, 8 Aug 2016 21:49:03 +0000 (21:49 +0000)]
Merge "Fix currentAnimationTimeMillis to use vsync time" into nyc-mr1-dev

8 years agoShortcutManager improve app udpate check
Makoto Onuki [Mon, 8 Aug 2016 21:11:34 +0000 (14:11 -0700)]
ShortcutManager improve app udpate check

- Don't use lastUpdateTime for system apps since it's not reliable.

- Scan downgraded apps too.

Bug 30708050
Bug 30734178
Change-Id: I98253f4c635466197548385275ab08c5e3a1a10b

8 years agoMerge "Fix infinite AVD not running" into nyc-mr1-dev am: a5dc817c75
Doris Liu [Mon, 8 Aug 2016 21:37:31 +0000 (21:37 +0000)]
Merge "Fix infinite AVD not running" into nyc-mr1-dev am: a5dc817c75
am: 186c4e6bed

Change-Id: Ib57dc83e6e2fef341187f5dd97dc6dab19ce2629

8 years agoFix infinite AVD not running am: 18e08a0170
Doris Liu [Mon, 8 Aug 2016 21:37:26 +0000 (21:37 +0000)]
Fix infinite AVD not running am: 18e08a0170
am: c66c046a18

Change-Id: I1c6b7e9f768fae2d9ab8b6e22b3d6386de80df89

8 years agoMerge "fix safeMode status in AppWidgetService"
Treehugger Robot [Mon, 8 Aug 2016 21:36:45 +0000 (21:36 +0000)]
Merge "fix safeMode status in AppWidgetService"

8 years agoMerge "Fix infinite AVD not running" into nyc-mr1-dev
Doris Liu [Mon, 8 Aug 2016 21:23:13 +0000 (21:23 +0000)]
Merge "Fix infinite AVD not running" into nyc-mr1-dev
am: a5dc817c75

Change-Id: Idf7c5b89ea14f53336dd51973845500726552dce

8 years agoFix infinite AVD not running
Doris Liu [Mon, 8 Aug 2016 21:23:10 +0000 (21:23 +0000)]
Fix infinite AVD not running
am: 18e08a0170

Change-Id: I104389d9264c88999e02a5a7547e3f8c382ce0a9

8 years agoMerge "Fix infinite AVD not running" into nyc-mr1-dev
Doris Liu [Mon, 8 Aug 2016 21:03:51 +0000 (21:03 +0000)]
Merge "Fix infinite AVD not running" into nyc-mr1-dev

8 years agoMerge "Restore padding." into nyc-mr1-dev am: 67abc837af
Julia Reynolds [Mon, 8 Aug 2016 20:18:07 +0000 (20:18 +0000)]
Merge "Restore padding." into nyc-mr1-dev am: 67abc837af
am: a70315d35f

Change-Id: I2d935442e9587ca3c71be303aba9b44730cb1964

8 years agoRestore padding. am: eded2fcf7a
Julia Reynolds [Mon, 8 Aug 2016 20:18:04 +0000 (20:18 +0000)]
Restore padding. am: eded2fcf7a
am: 1b6b6911e4

Change-Id: I70eafecab4bb48cbeeb85f0fe28af4d096957481

8 years agoMerge "Have BatteryStats track and report the running wakelocks." into nyc-mr1-dev...
Dianne Hackborn [Mon, 8 Aug 2016 20:13:04 +0000 (20:13 +0000)]
Merge "Have BatteryStats track and report the running wakelocks." into nyc-mr1-dev am: 154cc8237b
am: 179fca0241

Change-Id: Id16110695937a71d1bfb3a6ea068273305e91f9c

8 years agoHave BatteryStats track and report the running wakelocks. am: adbee556a9
Joe Onorato [Mon, 8 Aug 2016 20:13:00 +0000 (20:13 +0000)]
Have BatteryStats track and report the running wakelocks. am: adbee556a9
am: d55f7e646f

Change-Id: I27a7fea00398a717ae28be0dab89ab9c242aa419

8 years agoMerge "Restore padding." into nyc-mr1-dev
Julia Reynolds [Mon, 8 Aug 2016 20:12:30 +0000 (20:12 +0000)]
Merge "Restore padding." into nyc-mr1-dev
am: 67abc837af

Change-Id: Ib58f6c77e6211c73df7190c02483352fb4deb56a

8 years agoRestore padding.
Julia Reynolds [Mon, 8 Aug 2016 20:12:26 +0000 (20:12 +0000)]
Restore padding.
am: eded2fcf7a

Change-Id: I4f708fc0eb26ecf4844f4d48b9d87a979fb0d61a

8 years agoMerge "Restore padding." into nyc-mr1-dev
Julia Reynolds [Mon, 8 Aug 2016 20:05:52 +0000 (20:05 +0000)]
Merge "Restore padding." into nyc-mr1-dev

8 years agoMerge "Have BatteryStats track and report the running wakelocks." into nyc-mr1-dev
Dianne Hackborn [Mon, 8 Aug 2016 20:04:00 +0000 (20:04 +0000)]
Merge "Have BatteryStats track and report the running wakelocks." into nyc-mr1-dev
am: 154cc8237b

Change-Id: I1cc2b46355a5eb8aa03744e704b3393b2750ba25

8 years agoHave BatteryStats track and report the running wakelocks.
Joe Onorato [Mon, 8 Aug 2016 20:03:57 +0000 (20:03 +0000)]
Have BatteryStats track and report the running wakelocks.
am: adbee556a9

Change-Id: I02de7ade40163257d6d424b0ae37dba65d43a565

8 years agoMerge "Have BatteryStats track and report the running wakelocks." into nyc-mr1-dev
Dianne Hackborn [Mon, 8 Aug 2016 19:58:55 +0000 (19:58 +0000)]
Merge "Have BatteryStats track and report the running wakelocks." into nyc-mr1-dev

8 years agoFix infinite AVD not running
Doris Liu [Mon, 8 Aug 2016 19:47:20 +0000 (12:47 -0700)]
Fix infinite AVD not running

This CL fixed an integer overflow error caused by using integer literal
when it should be a float literal that defines a double.

BUG:30739855
Change-Id: If2bdb0eb7a2e93d28434bfe72ec11e8f1f2a1eda

8 years agoRestore padding.
Julia Reynolds [Mon, 8 Aug 2016 19:41:43 +0000 (15:41 -0400)]
Restore padding.

Change-Id: I532e5007c2a9152554b8f5130196a2f0cb3c8f1e
Fixes: 30738806

8 years agoMerge changes Idc4c2c14,Ibea016c6,I49ab58c3,Id911d405,I0f17dc5f, ... into nyc-mr1...
Selim Cinek [Mon, 8 Aug 2016 19:44:29 +0000 (19:44 +0000)]
Merge changes Idc4c2c14,Ibea016c6,I49ab58c3,Id911d405,I0f17dc5f, ... into nyc-mr1-dev am: 5a3e33a82a
am: 899f65dca9

Change-Id: Ib91eff9c38f7847e8d148dc7c51b757b0d41e8d6

8 years agoImproved the transition when clicking on the last notification am: 61b350cca6
Selim Cinek [Mon, 8 Aug 2016 19:43:21 +0000 (19:43 +0000)]
Improved the transition when clicking on the last notification am: 61b350cca6
am: 033987564c

Change-Id: Id0c8efe8e925b48f238626fb28bf1e8cb0caa66c

8 years agoFixed a bug that could lead to an empty notification am: aa3901a5ee
Selim Cinek [Mon, 8 Aug 2016 19:42:47 +0000 (19:42 +0000)]
Fixed a bug that could lead to an empty notification am: aa3901a5ee
am: 0314b86252

Change-Id: Id56f9fb4c03b77772593793ac16f48f5b79f2878

8 years agoRemoved contentDescriptions that hindered accessibility usability am: d871f95f49
Selim Cinek [Mon, 8 Aug 2016 19:42:16 +0000 (19:42 +0000)]
Removed contentDescriptions that hindered accessibility usability am: d871f95f49
am: dafed80e62

Change-Id: Ic0d7c57ab495318c3318b0f1827cde4c86e8e3d2

8 years agoFixes a bug where setting a null bigLargeIcon would not clear it am: e99acb29db
Selim Cinek [Mon, 8 Aug 2016 19:41:16 +0000 (19:41 +0000)]
Fixes a bug where setting a null bigLargeIcon would not clear it am: e99acb29db
am: c39f8c444a

Change-Id: Ie8f89574e35cb581b6f9b867a3fdff83bd12eed4