git.osdn.net Git - android-x86/frameworks-base.git/log

OSDN Git Service

(root) / android-x86 / frameworks-base.git / log

summary | shortlog | log | commit | commitdiff | tree
first ⋅ prev ⋅ next

commit | commitdiff | tree

Derek Sollenberger [Fri, 22 Jul 2016 16:13:32 +0000 (12:13 -0400)]

Remove LayerRenderer.

There is only one caller each for the static functions here so this
CL moves the logic to the caller. Also by moving some of the code
into the pipeline it makes it easier for future changes to configure
how a pipeline handles a layer.

Change-Id: Ib735b5154325cbb658fd151f7a19dbf434ab44b7

commit | commitdiff | tree

Marco Nelissen [Tue, 26 Jul 2016 16:03:52 +0000 (16:03 +0000)]

Merge \\\\"Fix memory leak in MediaScannerConnection\\\\" am: e40ab18590 am: 0d5bcda101 am: fd743b4d56
am: c737306bf9

Change-Id: I6ac82941cb1d5facab286d3ece9966908f6996a9

commit | commitdiff | tree

xiaoli.xb.zuo [Tue, 26 Jul 2016 15:55:13 +0000 (15:55 +0000)]

Merge \\\"Fix memory leak in MediaScannerConnection\\\" am: e40ab18590 am: 0d5bcda101
am: fd743b4d56

Change-Id: I9a8ef3f3ae06b5054f426e7936c5aa9548a9dfcd

commit | commitdiff | tree

Marco Nelissen [Tue, 26 Jul 2016 15:48:05 +0000 (15:48 +0000)]

Merge \\"Fix memory leak in MediaScannerConnection\\" am: e40ab18590
am: 0d5bcda101

Change-Id: I5714252c0373db0fc85bf65df7b52c983fbc6171

commit | commitdiff | tree

xiaoli.xb.zuo [Tue, 26 Jul 2016 15:43:55 +0000 (15:43 +0000)]

Merge \"Fix memory leak in MediaScannerConnection\"
am: e40ab18590

Change-Id: I894584a5d193624acc78c20a6207b54b20b61563

commit | commitdiff | tree

Marco Nelissen [Tue, 26 Jul 2016 15:37:32 +0000 (15:37 +0000)]

Merge "Fix memory leak in MediaScannerConnection"

commit | commitdiff | tree

Paul Jensen [Tue, 26 Jul 2016 15:21:50 +0000 (15:21 +0000)]

Merge \\"Sanity check ICMP6 router advertisement packets\\" into nyc-mr1-dev am: 4e40413c50
am: d3206fa7e7

Change-Id: I6146d1fd9aa590bf73576afb8b3593fcdfa45a97

commit | commitdiff | tree

Paul Jensen [Tue, 26 Jul 2016 15:21:47 +0000 (15:21 +0000)]

Sanity check ICMP6 router advertisement packets am: 4b545b04f6
am: ea4f322274

Change-Id: I998bfb1855e02088f44fbf0826dbadc21773c446

commit | commitdiff | tree

Paul Jensen [Tue, 26 Jul 2016 15:21:44 +0000 (15:21 +0000)]

Merge \\"Don\\'t let sign-in to network app appear in recents when it finishes\\" into nyc-mr1-dev am: c78bd7f01f
am: 9956784d32

Change-Id: Iae9aa90a14d064c77241759e9172483e7a042159

commit | commitdiff | tree

Paul Jensen [Tue, 26 Jul 2016 15:18:58 +0000 (15:18 +0000)]

Don\\'t let sign-in to network app appear in recents when it finishes am: 6a776c8317
am: 095e08981f

Change-Id: I7e6e4bab006317f5ff89be75d6ee03023d873b06

commit | commitdiff | tree

Hugo Benichi [Tue, 26 Jul 2016 15:18:55 +0000 (15:18 +0000)]

Merge \\"Add CONNECTIVITY_USE_RESTRICTED_NETWORKS permission\\" into nyc-mr1-dev am: 7c731f9e1f
am: 02dade4bce

Change-Id: I6e3927b89fc848d6ced04e2e64b321825fd6c585

commit | commitdiff | tree

Hugo Benichi [Tue, 26 Jul 2016 15:18:51 +0000 (15:18 +0000)]

resolve merge conflicts of 514da60 to nyc-mr1-dev-plus-aosp
am: 524b2e4f30

Change-Id: Ia0a4544784592ac857e5bd652fee47eec621f3a0

commit | commitdiff | tree

Chris Craik [Tue, 26 Jul 2016 15:18:47 +0000 (15:18 +0000)]

Merge \\"Avoid destroying TextureView surfaces for onStop\\" into nyc-mr1-dev am: eaa6d6b2c9
am: 2feece06aa

Change-Id: I8ebcf35d28d5144d2dfec8371f44e5597474de0d

commit | commitdiff | tree

Chris Craik [Tue, 26 Jul 2016 15:18:45 +0000 (15:18 +0000)]

Avoid destroying TextureView surfaces for onStop am: 391d560402
am: 5fbbcdcd32

Change-Id: I1bda6841c540572ff9390c0124cb1ac9f6f22c83

commit | commitdiff | tree

Hangyu Kuang [Tue, 26 Jul 2016 15:15:32 +0000 (15:15 +0000)]

Merge \\"media: Add hidden api to set video encoding profile and level.\\" into nyc-mr1-dev am: e7e1f0b788
am: 601ececb8c

Change-Id: I02c12aeda3ac225d663fed2ca77d4ceb07872829

commit | commitdiff | tree

Hangyu Kuang [Tue, 26 Jul 2016 15:15:27 +0000 (15:15 +0000)]

media: Add hidden api to set video encoding profile and level. am: f70ad43f13
am: 2725d89822

Change-Id: I3c702fc0ce1b1ac78b894f665d5811c1c65c62b4

commit | commitdiff | tree

Michael Kwan [Tue, 26 Jul 2016 15:15:21 +0000 (15:15 +0000)]

Merge \\"Add top and bottom panel overlay to lists in AlertDialog for watch.\\" into nyc-mr1-dev am: ad74941699
am: 690d86aef4

Change-Id: Ia82d309620693b52ce7fea364fce405ee0c273ed

commit | commitdiff | tree

Michael Kwan [Tue, 26 Jul 2016 15:15:17 +0000 (15:15 +0000)]

Add top and bottom panel overlay to lists in AlertDialog for watch. am: 55e4030f77
am: 253bc8d035

Change-Id: I75cb4527c56f14d58d7ab7826112b08ed368d81e

commit | commitdiff | tree

Vladislav Kaznacheev [Tue, 26 Jul 2016 15:15:09 +0000 (15:15 +0000)]

Merge \\"Fix AM.revokeUriPermissionFromOwner for prefix mode.\\" into nyc-mr1-dev am: 0217d4e6b8
am: c5767e2eb6

Change-Id: If3514e10496b6a6b781947948f0d88b83427403f

commit | commitdiff | tree

Vladislav Kaznacheev [Tue, 26 Jul 2016 15:12:03 +0000 (15:12 +0000)]

Fix AM.revokeUriPermissionFromOwner for prefix mode. am: 4498aa6c58
am: f12d0c96d3

Change-Id: I399e4040f664127ab3b321a4bb5a6ca3023b7be5

commit | commitdiff | tree

Philip P. Moltmann [Tue, 26 Jul 2016 15:11:55 +0000 (15:11 +0000)]

Merge \\"Set title in onCreate.\\" into nyc-mr1-dev am: fb5a07938f
am: 784f0a23a4

Change-Id: I7e49f763187dbe73f1bec2f71c4f8e13906a4bb4

commit | commitdiff | tree

Philip P. Moltmann [Tue, 26 Jul 2016 15:11:47 +0000 (15:11 +0000)]

Set title in onCreate. am: fef31ad5ae
am: 28c09c612f

Change-Id: I317a2ea5525518a77d286c4f472de41b2ce43bba

commit | commitdiff | tree

Justin Klaassen [Tue, 26 Jul 2016 15:11:39 +0000 (15:11 +0000)]

Merge changes I1acc3a4f,Ib049d75f into nyc-mr1-dev-plus-aosp
am: e9720671cc

Change-Id: Ie4210de38ac851d4dfd2ba83cd8db8db890e763f

commit | commitdiff | tree

Justin Klaassen [Tue, 26 Jul 2016 15:11:34 +0000 (15:11 +0000)]

Merge \\"Fix NPE in ValueAnimator\\" into nyc-mr1-dev am: 65dfc2a3e5
am: c98c5e0fc3

Change-Id: Ie16e4f6d04d42eed941eb24ab55d4339d38260d8

commit | commitdiff | tree

Justin Klaassen [Tue, 26 Jul 2016 15:11:27 +0000 (15:11 +0000)]

Fix NPE in ValueAnimator am: 543a7ed7af
am: 705e2fb40c

Change-Id: I5beab0d64c1544344f1153f183c513839f673a1f

commit | commitdiff | tree

Raph Levien [Tue, 26 Jul 2016 15:11:19 +0000 (15:11 +0000)]

Merge changes from topic \'am-9fd0a895a44f4e7ebb6eebb2d79a62a9\' into nyc-mr1-dev-plus-aosp
am: 982409895c

Change-Id: I0c256aec72b97d1f90f5eb981a9ac472d0e98dac

commit | commitdiff | tree

Raph Levien [Tue, 26 Jul 2016 15:11:16 +0000 (15:11 +0000)]

Merge \\"Enforce consistent sizes for arrays in SpannableStringInternal\\" into nyc-mr1-dev am: 4e0fc3ccd2
am: b3326e1cd4

Change-Id: Ic60e5dc71c85a31ecf4541291f2272023a48e428

commit | commitdiff | tree

Raph Levien [Tue, 26 Jul 2016 15:11:09 +0000 (15:11 +0000)]

Enforce consistent sizes for arrays in SpannableStringInternal am: 83549088c6
am: 878346cb07

Change-Id: I7a7af44dbfe328f6a34bf50609d8d50a00350ae1

commit | commitdiff | tree

Philip P. Moltmann [Tue, 26 Jul 2016 15:07:58 +0000 (15:07 +0000)]

Merge changes Idf939fd3,I6ae3f730 into nyc-mr1-dev-plus-aosp
am: 23c6d928ed

Change-Id: I9d9d93154e8c9f378261c756146a6c0774c0b40c

commit | commitdiff | tree

Philip P. Moltmann [Tue, 26 Jul 2016 15:07:55 +0000 (15:07 +0000)]

Merge \\"Handle USB power role \\'sink\\'\\" into nyc-mr1-dev am: d021ba34fb
am: 74206f0533

Change-Id: Ic03ac0be19d1f42ee40a01b2914a90568597e841

commit | commitdiff | tree

Philip P. Moltmann [Tue, 26 Jul 2016 15:07:50 +0000 (15:07 +0000)]

Handle USB power role \\'sink\\' am: 0135516153
am: 6d0ea86fec

Change-Id: I6dd5eb7a328bd4071c4c40a2a982ec4b7de0b785

commit | commitdiff | tree

Mark Lu [Tue, 26 Jul 2016 15:07:45 +0000 (15:07 +0000)]

Merge \"Merge \\\"docs: updates to Buildilng Your First App doc\\\" into nyc-dev am: d579d713a5 am: 0da397ea71\" into nyc-mr1-dev-plus-aosp
am: eba36e8db9

Change-Id: I989a5d85001bbb8dfcb296628d452828670d661c

commit | commitdiff | tree

Mark Lu [Tue, 26 Jul 2016 15:07:41 +0000 (15:07 +0000)]

Merge \\\"docs: updates to Buildilng Your First App doc\\\" into nyc-dev am: d579d713a5 am: 0da397ea71
am: 172b5d4d5c

Change-Id: Id7a171f4ad50b897c7a184b1f699413db0ee03d1

commit | commitdiff | tree

Mark Lu [Tue, 26 Jul 2016 15:07:33 +0000 (15:07 +0000)]

Merge \"docs: updates to Buildilng Your First App doc am: 08d1bff71f am: 325ce1a475\" into nyc-mr1-dev-plus-aosp
am: 3afc931fc3

Change-Id: I842697b78db33a78ec469555a0f8ec6eba66927a

commit | commitdiff | tree

Mark Lu [Tue, 26 Jul 2016 15:07:29 +0000 (15:07 +0000)]

docs: updates to Buildilng Your First App doc am: 08d1bff71f am: 325ce1a475
am: 64b340220f

Change-Id: If510d335a263491bc1cd9ad04edd46ce41bd253d

commit | commitdiff | tree

Selim Cinek [Tue, 26 Jul 2016 15:07:20 +0000 (15:07 +0000)]

Merge changes I39b8c6a5,I6a15fdea,I459d3e01 into nyc-mr1-dev-plus-aosp
am: a2b355bba6

Change-Id: Icd0f9fafd9366eebdc901aaa98d061332208d9fa

commit | commitdiff | tree

Selim Cinek [Tue, 26 Jul 2016 15:07:16 +0000 (15:07 +0000)]

Merge changes from topic \\'home-button-lock-nyc-mr1-dev\\' into nyc-mr1-dev am: 52a11f7c64
am: a3b7b7f8c7

Change-Id: Id2be8fe7229946165ab3551ec5e9ba8d347acac8

commit | commitdiff | tree

Selim Cinek [Tue, 26 Jul 2016 15:07:09 +0000 (15:07 +0000)]

Fixes a bug where the lockscreen would be frozen am: 3127daf036
am: d9d592ceff

Change-Id: I258e812bc6d00fd15850fd79b27601f65a398f95

commit | commitdiff | tree

Selim Cinek [Tue, 26 Jul 2016 15:07:00 +0000 (15:07 +0000)]

Allow home button to be tapped while a incoming call shows a HUN am: 64be772e03
am: 3ee95debda

Change-Id: I6b256ffbaf2e22b2e62db627f7c2f5ca3834f501

commit | commitdiff | tree

Jason Monk [Tue, 26 Jul 2016 15:06:49 +0000 (15:06 +0000)]

Merge changes I19e53731,I12ec6445 into nyc-mr1-dev-plus-aosp
am: b43041a8e9

Change-Id: I1e57cf7cd157790f199449bf19cb6288c70c7226

commit | commitdiff | tree

Jason Monk [Tue, 26 Jul 2016 15:06:41 +0000 (15:06 +0000)]

Merge \\"QS: Cleanup detail toggle on\\" into nyc-mr1-dev am: 5c6f5afd19
am: 8255f2c11a

Change-Id: I623b64a517eb00cb86998955346cd0a52c3c73b3

commit | commitdiff | tree

Paul Jensen [Tue, 26 Jul 2016 14:39:45 +0000 (14:39 +0000)]

Merge \"Sanity check ICMP6 router advertisement packets\" into nyc-mr1-dev
am: 4e40413c50

Change-Id: I5365b39534fd01efe9f2d8e74efd1ccba06eba4a

commit | commitdiff | tree

Paul Jensen [Tue, 26 Jul 2016 14:39:42 +0000 (14:39 +0000)]

Sanity check ICMP6 router advertisement packets
am: 4b545b04f6

Change-Id: I129ce4cbe5c893e507050ff23fd2f5261466c970

commit | commitdiff | tree

Paul Jensen [Tue, 26 Jul 2016 14:33:30 +0000 (14:33 +0000)]

Merge \"Don\'t let sign-in to network app appear in recents when it finishes\" into nyc-mr1-dev
am: c78bd7f01f

Change-Id: I288ab6796ab15e982423cf6e58bfdacf1ca5cf52

commit | commitdiff | tree

Paul Jensen [Tue, 26 Jul 2016 14:33:26 +0000 (14:33 +0000)]

Don\'t let sign-in to network app appear in recents when it finishes
am: 6a776c8317

Change-Id: Id0bca631f030c8c344b1bcac52f731152ab858a0

commit | commitdiff | tree

Paul Jensen [Tue, 26 Jul 2016 14:29:59 +0000 (14:29 +0000)]

Merge "Sanity check ICMP6 router advertisement packets" into nyc-mr1-dev

commit | commitdiff | tree

Paul Jensen [Tue, 26 Jul 2016 14:26:29 +0000 (14:26 +0000)]

Merge "Don't let sign-in to network app appear in recents when it finishes" into nyc-mr1-dev

commit | commitdiff | tree

Jason Monk [Tue, 26 Jul 2016 13:22:18 +0000 (09:22 -0400)]

resolve merge conflicts of 10357a7 to master

Change-Id: I2c185ee5949ff5a67175c08b86026a060b69dc06

commit | commitdiff | tree

Derek Sollenberger [Tue, 26 Jul 2016 12:07:46 +0000 (12:07 +0000)]

Merge "Remove unused member variable from DeviceInfo."

commit | commitdiff | tree

Hugo Benichi [Tue, 26 Jul 2016 05:34:56 +0000 (05:34 +0000)]

Merge \"Add CONNECTIVITY_USE_RESTRICTED_NETWORKS permission\" into nyc-mr1-dev
am: 7c731f9e1f

Change-Id: I22c2a9aaedcdbf842c1afe119edaaac18c3522df

commit | commitdiff | tree

Hugo Benichi [Tue, 26 Jul 2016 04:08:14 +0000 (13:08 +0900)]

resolve merge conflicts of 514da60 to nyc-mr1-dev-plus-aosp

Change-Id: Ib1c01241fece36f660d27f3450ba8059b3b2809f

commit | commitdiff | tree

Hugo Benichi [Tue, 26 Jul 2016 02:46:30 +0000 (02:46 +0000)]

Merge "Add CONNECTIVITY_USE_RESTRICTED_NETWORKS permission" into nyc-mr1-dev

commit | commitdiff | tree

Chris Craik [Tue, 26 Jul 2016 00:29:48 +0000 (00:29 +0000)]

Merge \"Avoid destroying TextureView surfaces for onStop\" into nyc-mr1-dev
am: eaa6d6b2c9

Change-Id: Ic8207def7703c1209dbb3b33301803b32cc44bb7

commit | commitdiff | tree

Chris Craik [Tue, 26 Jul 2016 00:29:44 +0000 (00:29 +0000)]

Avoid destroying TextureView surfaces for onStop
am: 391d560402

Change-Id: I6e1e5a5f024410e7e0288910386cbc439b8a9039

commit | commitdiff | tree

TreeHugger Robot [Tue, 26 Jul 2016 00:06:43 +0000 (00:06 +0000)]

Merge "Avoid destroying TextureView surfaces for onStop" into nyc-mr1-dev

commit | commitdiff | tree

Hangyu Kuang [Mon, 25 Jul 2016 23:45:38 +0000 (23:45 +0000)]

Merge \"media: Add hidden api to set video encoding profile and level.\" into nyc-mr1-dev
am: e7e1f0b788

Change-Id: I9322ddf1e5dba78363b87976639433f008620753

commit | commitdiff | tree

Hangyu Kuang [Mon, 25 Jul 2016 23:45:35 +0000 (23:45 +0000)]

media: Add hidden api to set video encoding profile and level.
am: f70ad43f13

Change-Id: I3bb9bf5884d791dd5d97fbda8117d1d4f3b1b40f

commit | commitdiff | tree

TreeHugger Robot [Mon, 25 Jul 2016 23:39:59 +0000 (23:39 +0000)]

Merge "media: Add hidden api to set video encoding profile and level." into nyc-mr1-dev

commit | commitdiff | tree

Siyamed Sinir [Mon, 25 Jul 2016 23:12:04 +0000 (23:12 +0000)]

Merge "Update font feature settings w3 URL in api doc"

commit | commitdiff | tree

TreeHugger Robot [Mon, 25 Jul 2016 23:08:56 +0000 (23:08 +0000)]

Merge "Fix incorrect @link in ACTION_STORAGE_CHANGED comment"

commit | commitdiff | tree

Michael Kwan [Mon, 25 Jul 2016 23:05:54 +0000 (23:05 +0000)]

Merge \"Add top and bottom panel overlay to lists in AlertDialog for watch.\" into nyc-mr1-dev
am: ad74941699

Change-Id: I36e7157a24141db4cd17828206435788b8abb69a

commit | commitdiff | tree

Michael Kwan [Mon, 25 Jul 2016 23:05:43 +0000 (23:05 +0000)]

Add top and bottom panel overlay to lists in AlertDialog for watch.
am: 55e4030f77

Change-Id: I383c2ad50871265c1f521ecfd7f46d15027dc29c

commit | commitdiff | tree

Vladislav Kaznacheev [Mon, 25 Jul 2016 23:05:31 +0000 (23:05 +0000)]

Merge \"Fix AM.revokeUriPermissionFromOwner for prefix mode.\" into nyc-mr1-dev
am: 0217d4e6b8

Change-Id: I90c33ff1d5d24f2cd5e578d98193ee900eff6cc1

commit | commitdiff | tree

Vladislav Kaznacheev [Mon, 25 Jul 2016 23:05:22 +0000 (23:05 +0000)]

Fix AM.revokeUriPermissionFromOwner for prefix mode.
am: 4498aa6c58

Change-Id: I752efeb20f5fd28576babb7f90bdc79dbec02366

commit | commitdiff | tree

Philip P. Moltmann [Mon, 25 Jul 2016 23:05:14 +0000 (23:05 +0000)]

Merge \"Set title in onCreate.\" into nyc-mr1-dev
am: fb5a07938f

Change-Id: Icfb399258314565515c151cb3d3b188b868a76b2

commit | commitdiff | tree

Philip P. Moltmann [Mon, 25 Jul 2016 23:05:10 +0000 (23:05 +0000)]

Set title in onCreate.
am: fef31ad5ae

Change-Id: Ide036a4f9bed9953040be7aa0f0fee26f9c84c82

commit | commitdiff | tree

Jason Monk [Mon, 25 Jul 2016 22:58:43 +0000 (22:58 +0000)]

Merge changes I2107c355,I60b5e161 into nyc-mr1-dev-plus-aosp
am: 8db381c0a0

Change-Id: Ia890077286aa752b237739573efc865136fe1b89

commit | commitdiff | tree

Jason Monk [Mon, 25 Jul 2016 22:58:40 +0000 (22:58 +0000)]

Merge \\"QS: Fixup footer + animations\\" into nyc-mr1-dev am: 425023fcda
am: 56c50d82f2

Change-Id: I780917a8244222663fad3da28254c595b411a564

commit | commitdiff | tree

Jason Monk [Mon, 25 Jul 2016 22:58:35 +0000 (22:58 +0000)]

QS: Fixup footer + animations am: df36aed859
am: 7ce7d46728

Change-Id: Ib339b4174bd0da993a31f5be2ed6a8f852e3b318

commit | commitdiff | tree

Jorim Jaggi [Mon, 25 Jul 2016 22:58:28 +0000 (22:58 +0000)]

Merge changes I5a1e9d04,Ic6f20e06 into nyc-mr1-dev-plus-aosp
am: 1549c28f8d

Change-Id: I56bdf032da222f773c6255de2166db884ed724ce

commit | commitdiff | tree

Jorim Jaggi [Mon, 25 Jul 2016 22:58:24 +0000 (22:58 +0000)]

Merge \\"Don\\'t reset layout params when repositioning\\" into nyc-mr1-dev am: 961492cc30
am: 358ea1cc0f

Change-Id: I9bc495f56bf4bcfff81caba67ce109688f57db74

commit | commitdiff | tree

Jorim Jaggi [Mon, 25 Jul 2016 22:58:17 +0000 (22:58 +0000)]

Don\\'t reset layout params when repositioning am: 90dfb89916
am: 92a1a380c3

Change-Id: I11d00e9ed4550886d7711a406436909530d24286

commit | commitdiff | tree

Dirk Dougherty [Mon, 25 Jul 2016 22:58:10 +0000 (22:58 +0000)]

Merge \"Merge \\\"Fix code tags that contain html encoded characters, and fix at links.\\\" into nyc-dev am: fc0bc7bf96 am: dd756c26e2\" into nyc-mr1-dev-plus-aosp
am: b27502cfa8

Change-Id: I14d2f94009742a853c866608ae36916996a7975b

commit | commitdiff | tree

Elliot Waite [Mon, 25 Jul 2016 22:58:03 +0000 (22:58 +0000)]

Merge \\\"Fix code tags that contain html encoded characters, and fix at links.\\\" into nyc-dev am: fc0bc7bf96 am: dd756c26e2
am: c6b2cce52b

Change-Id: I8630c5a63550fcf1313ec78d5aef60c6a73d648c

commit | commitdiff | tree

Android Build Merger (Role) [Mon, 25 Jul 2016 22:52:07 +0000 (22:52 +0000)]

Merge changes I1acc3a4f,Ib049d75f into nyc-mr1-dev-plus-aosp

* changes:
Merge \"Fix NPE in ValueAnimator\" into nyc-mr1-dev am: 65dfc2a3e5
Fix NPE in ValueAnimator am: 543a7ed7af

commit | commitdiff | tree

Mark Lu [Mon, 25 Jul 2016 22:51:58 +0000 (22:51 +0000)]

Merge \\\"docs: updates to Buildilng Your First App doc\\\" into nyc-dev am: d579d713a5 am: 041ac3d576
am: 9a5cbaf9d5

Change-Id: I67d9aa1303cdfb416bd5bb364b63a5ae088f8b92

commit | commitdiff | tree

Android Build Merger (Role) [Mon, 25 Jul 2016 22:51:53 +0000 (22:51 +0000)]

Merge changes from topic 'am-9fd0a895a44f4e7ebb6eebb2d79a62a9' into nyc-mr1-dev-plus-aosp

* changes:
Merge \"Enforce consistent sizes for arrays in SpannableStringInternal\" into nyc-mr1-dev am: 4e0fc3ccd2
Enforce consistent sizes for arrays in SpannableStringInternal am: 83549088c6

commit | commitdiff | tree

Mark Lu [Mon, 25 Jul 2016 22:51:51 +0000 (22:51 +0000)]

docs: updates to Buildilng Your First App doc am: 08d1bff71f am: 04fb0c328d
am: e8d386e0f9

Change-Id: Ia18591f7d7b904f341948fe3d834ac69db2bac02

commit | commitdiff | tree

Elliot Waite [Mon, 25 Jul 2016 22:51:43 +0000 (22:51 +0000)]

Merge \\\"Fix code tags that contain html encoded characters, and fix at links.\\\" into nyc-dev am: fc0bc7bf96 am: b653777ae3
am: 5c5663e7ab

Change-Id: Iae69ca63ce98af1dc3811eb4bac8060272e05f91

commit | commitdiff | tree

Android Build Merger (Role) [Mon, 25 Jul 2016 22:51:38 +0000 (22:51 +0000)]

Merge changes Idf939fd3,I6ae3f730 into nyc-mr1-dev-plus-aosp

* changes:
Merge \"Handle USB power role \'sink\'\" into nyc-mr1-dev am: d021ba34fb
Handle USB power role \'sink\' am: 0135516153

commit | commitdiff | tree

Android Build Merger (Role) [Mon, 25 Jul 2016 22:51:21 +0000 (22:51 +0000)]

Merge "Merge \\"docs: updates to Buildilng Your First App doc\\" into nyc-dev am: d579d713a5 am: 0da397ea71" into nyc-mr1-dev-plus-aosp

commit | commitdiff | tree

Android Build Merger (Role) [Mon, 25 Jul 2016 22:51:03 +0000 (22:51 +0000)]

Merge "docs: updates to Buildilng Your First App doc am: 08d1bff71f am: 325ce1a475" into nyc-mr1-dev-plus-aosp

commit | commitdiff | tree

Justin Klaassen [Mon, 25 Jul 2016 22:50:11 +0000 (22:50 +0000)]

Merge \"Fix NPE in ValueAnimator\" into nyc-mr1-dev
am: 65dfc2a3e5

Change-Id: I1acc3a4f5e540900f6e798e924ff26d5ab954d89

commit | commitdiff | tree

Justin Klaassen [Mon, 25 Jul 2016 22:50:07 +0000 (22:50 +0000)]

Fix NPE in ValueAnimator
am: 543a7ed7af

Change-Id: Ib049d75f8c8460c3e7498080bbe502e67078e6ac

commit | commitdiff | tree

Raph Levien [Mon, 25 Jul 2016 22:49:47 +0000 (22:49 +0000)]

Merge \"Enforce consistent sizes for arrays in SpannableStringInternal\" into nyc-mr1-dev
am: 4e0fc3ccd2

Change-Id: I1d9951d56d0ba4893e4b09fb984cde3328ec390a

commit | commitdiff | tree

Raph Levien [Mon, 25 Jul 2016 22:49:14 +0000 (22:49 +0000)]

Enforce consistent sizes for arrays in SpannableStringInternal
am: 83549088c6

Change-Id: I6fd3b65dd388abcce6f8b7062f396a6fcf8fdf7a

commit | commitdiff | tree

Philip P. Moltmann [Mon, 25 Jul 2016 22:49:02 +0000 (22:49 +0000)]

Merge \"Handle USB power role \'sink\'\" into nyc-mr1-dev
am: d021ba34fb

Change-Id: Idf939fd3875a4b232ebde6cd43a6d03e13f85a36

commit | commitdiff | tree

Philip P. Moltmann [Mon, 25 Jul 2016 22:48:54 +0000 (22:48 +0000)]

Handle USB power role \'sink\'
am: 0135516153

Change-Id: I6ae3f73072d811fc4319ff8c498962fc1802fb6f

commit | commitdiff | tree

Mark Lu [Mon, 25 Jul 2016 22:48:49 +0000 (22:48 +0000)]

Merge \\"docs: updates to Buildilng Your First App doc\\" into nyc-dev am: d579d713a5
am: 0da397ea71

Change-Id: Ifafd54ba11ada726905b9e0fc3a936d59ffd968d

commit | commitdiff | tree

Mark Lu [Mon, 25 Jul 2016 22:48:45 +0000 (22:48 +0000)]

docs: updates to Buildilng Your First App doc am: 08d1bff71f
am: 325ce1a475

Change-Id: Ia206bc01acd7eb17ed3ce2074c84f479351b970f

commit | commitdiff | tree

Android Build Merger (Role) [Mon, 25 Jul 2016 22:47:47 +0000 (22:47 +0000)]

Merge changes I39b8c6a5,I6a15fdea,I459d3e01 into nyc-mr1-dev-plus-aosp

* changes:
  Merge changes from topic \'home-button-lock-nyc-mr1-dev\' into nyc-mr1-dev am: 52a11f7c64
  Fixes a bug where the lockscreen would be frozen am: 3127daf036
  Allow home button to be tapped while a incoming call shows a HUN am: 64be772e03

commit | commitdiff | tree

Android Build Merger (Role) [Mon, 25 Jul 2016 22:47:30 +0000 (22:47 +0000)]

Merge changes I19e53731,I12ec6445 into nyc-mr1-dev-plus-aosp

* changes:
Merge \"QS: Cleanup detail toggle on\" into nyc-mr1-dev am: 5c6f5afd19
QS: Cleanup detail toggle on am: 35a9c14cc6

commit | commitdiff | tree

Android Build Merger (Role) [Mon, 25 Jul 2016 22:47:17 +0000 (22:47 +0000)]

Merge changes I2107c355,I60b5e161 into nyc-mr1-dev-plus-aosp

* changes:
Merge \"QS: Fixup footer + animations\" into nyc-mr1-dev am: 425023fcda
QS: Fixup footer + animations am: df36aed859

commit | commitdiff | tree

Android Build Merger (Role) [Mon, 25 Jul 2016 22:47:03 +0000 (22:47 +0000)]

Merge changes I5a1e9d04,Ic6f20e06 into nyc-mr1-dev-plus-aosp

* changes:
Merge \"Don\'t reset layout params when repositioning\" into nyc-mr1-dev am: 961492cc30
Don\'t reset layout params when repositioning am: 90dfb89916

commit | commitdiff | tree

Android Build Merger (Role) [Mon, 25 Jul 2016 22:46:46 +0000 (22:46 +0000)]

Merge "Merge \\"Fix code tags that contain html encoded characters, and fix at links.\\" into nyc-dev am: fc0bc7bf96 am: dd756c26e2" into nyc-mr1-dev-plus-aosp

commit | commitdiff | tree

Selim Cinek [Mon, 25 Jul 2016 22:45:40 +0000 (22:45 +0000)]

Merge changes from topic \'home-button-lock-nyc-mr1-dev\' into nyc-mr1-dev
am: 52a11f7c64

Change-Id: I39b8c6a55804b088705889888d006695ef54231d

commit | commitdiff | tree

Selim Cinek [Mon, 25 Jul 2016 22:45:36 +0000 (22:45 +0000)]

Fixes a bug where the lockscreen would be frozen
am: 3127daf036

Change-Id: I6a15fdea3a17a9f6991931edfcd6aa7b224ff159

commit | commitdiff | tree

Selim Cinek [Mon, 25 Jul 2016 22:45:30 +0000 (22:45 +0000)]

Allow home button to be tapped while a incoming call shows a HUN
am: 64be772e03

Change-Id: I459d3e0160f0b4acdd64e31dc31948685a98cf2a

commit | commitdiff | tree

Jason Monk [Mon, 25 Jul 2016 22:45:24 +0000 (22:45 +0000)]

Merge \"QS: Cleanup detail toggle on\" into nyc-mr1-dev
am: 5c6f5afd19

Change-Id: I19e5373128c30c46838ba80d3a4d49581f7793ee

commit | commitdiff | tree

Jason Monk [Mon, 25 Jul 2016 22:45:21 +0000 (22:45 +0000)]

QS: Cleanup detail toggle on
am: 35a9c14cc6

Change-Id: I12ec6445c3536235d900f23af57bedf9efcdec28

frameworks/base

About OSDN

Find Software

Develop Software

Help

Copyright ©OSDN Corporation All rights reserved.