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

Ben Lin [Thu, 13 Oct 2016 23:51:33 +0000 (23:51 +0000)]

Removing a mimeIcon specific for album folders from MediaProvider.
am: 6d33357882

Change-Id: I07ec7d315c510a5c3bb289a7fa2f6bb8100ebee8

commit | commitdiff | tree

Sungsoo [Thu, 13 Oct 2016 22:57:58 +0000 (22:57 +0000)]

DO NOT MERGE) ExifInterface: Provide backward compatibility am: c11f599a2f am: 29e643bcbd am: 68aa33b9bf -s ours am: 2a762996cb -s ours am: a8d06257c1 am: 2179b54c9c -s ours am: 279ebd7ffd am: 7598d6ac9f am: 30404396be am: d7475b491d -s ours am: 3069b72d76 am: 1fa97872ec
am: a123773c9c

Change-Id: I992c1e69a284c35d471e2b7c8f566f0d1e377736

commit | commitdiff | tree

Michal Karpinski [Thu, 13 Oct 2016 22:52:41 +0000 (22:52 +0000)]

Merge "Don't expose default strong auth timeout as constant" into nyc-mr1-dev
am: a6b3caf58e

Change-Id: I9763e78b50a98dcf1139cdc299a8944e94c824d9

commit | commitdiff | tree

Michal Karpinski [Thu, 13 Oct 2016 22:52:38 +0000 (22:52 +0000)]

Don't expose default strong auth timeout as constant
am: 6dbf67fc48

Change-Id: Iacbe9a2de7024e29e9c2c98594ebca828b855a43

commit | commitdiff | tree

Sungsoo [Thu, 13 Oct 2016 22:49:46 +0000 (22:49 +0000)]

DO NOT MERGE) ExifInterface: Provide backward compatibility am: c11f599a2f am: 29e643bcbd am: 68aa33b9bf -s ours am: 2a762996cb -s ours am: a8d06257c1 am: 2179b54c9c -s ours am: 279ebd7ffd am: 7598d6ac9f am: 30404396be am: d7475b491d -s ours am: 3069b72d76
am: 1fa97872ec

Change-Id: Icd3b420b2a0821e621c5c471859fd8bce50c557f

commit | commitdiff | tree

TreeHugger Robot [Thu, 13 Oct 2016 22:47:27 +0000 (22:47 +0000)]

Merge "Don't expose default strong auth timeout as constant" into nyc-mr1-dev

commit | commitdiff | tree

Sungsoo [Thu, 13 Oct 2016 22:45:14 +0000 (22:45 +0000)]

DO NOT MERGE) ExifInterface: Provide backward compatibility am: c11f599a2f am: 29e643bcbd am: 68aa33b9bf -s ours am: 2a762996cb -s ours am: a8d06257c1 am: 2179b54c9c -s ours am: 279ebd7ffd am: 7598d6ac9f am: 30404396be am: d7475b491d -s ours
am: 3069b72d76

Change-Id: If2814b43999d769e202447a5de4cff22af274b34

commit | commitdiff | tree

Sungsoo [Thu, 13 Oct 2016 22:40:33 +0000 (22:40 +0000)]

DO NOT MERGE) ExifInterface: Provide backward compatibility am: c11f599a2f am: 29e643bcbd am: 68aa33b9bf -s ours am: 2a762996cb -s ours am: a8d06257c1 am: 2179b54c9c -s ours am: 279ebd7ffd am: 7598d6ac9f am: 30404396be
am: d7475b491d -s ours

Change-Id: I2b29c3d4e9675fcae86d4c9654d7e282fbc8c13d

commit | commitdiff | tree

Sungsoo [Thu, 13 Oct 2016 22:40:27 +0000 (22:40 +0000)]

DO NOT MERGE) ExifInterface: Provide backward compatibility am: 22bd36448e -s ours am: 3992742559 am: 2816a5fa5e -s ours am: 03593fe78f am: ad11872ded am: d3f3729a17 am: 9d675aadf1 -s ours am: 3ab3eff7c1 am: 8d73b75c07
am: 790d332659

Change-Id: I67639fbbcf420f9ab873225387f61254b53fcbca

commit | commitdiff | tree

Sungsoo [Thu, 13 Oct 2016 22:35:59 +0000 (22:35 +0000)]

DO NOT MERGE) ExifInterface: Provide backward compatibility am: 22bd36448e -s ours am: 3992742559 am: 2816a5fa5e -s ours am: 03593fe78f am: ad11872ded am: d3f3729a17 am: 9d675aadf1 -s ours am: 3ab3eff7c1
am: 8d73b75c07

Change-Id: I273132962ccfe12384787f2f5bb11dbab43aeee0

commit | commitdiff | tree

Sungsoo [Thu, 13 Oct 2016 22:35:56 +0000 (22:35 +0000)]

DO NOT MERGE) ExifInterface: Provide backward compatibility am: c11f599a2f am: 29e643bcbd am: 68aa33b9bf -s ours am: 2a762996cb -s ours am: a8d06257c1 am: 2179b54c9c -s ours am: 279ebd7ffd am: 7598d6ac9f
am: 30404396be

Change-Id: I31e6e3b5b6ab06e7c6025fb5be054a21d38c8477

commit | commitdiff | tree

Sungsoo [Thu, 13 Oct 2016 22:33:57 +0000 (22:33 +0000)]

DO NOT MERGE) ExifInterface: Provide backward compatibility am: 87a9ac70c3 am: 11b522b40f -s ours am: 8b764f10c3 am: 29273190f1 am: 7bb855a973 am: 68469a695e -s ours am: b4fdad2b8c am: 2dc905eb4d
am: 4dabb1d8bb

Change-Id: I1c180bcfc9bdd8e09518f8ac33b371829657580a

commit | commitdiff | tree

Sungsoo [Thu, 13 Oct 2016 22:31:14 +0000 (22:31 +0000)]

DO NOT MERGE) ExifInterface: Provide backward compatibility am: 22bd36448e -s ours am: 3992742559 am: 2816a5fa5e -s ours am: 03593fe78f am: ad11872ded am: d3f3729a17 am: 9d675aadf1 -s ours
am: 3ab3eff7c1

Change-Id: I2f9a8960c77f3dfdb393c76f7d8d17647d617000

commit | commitdiff | tree

Sungsoo [Thu, 13 Oct 2016 22:30:59 +0000 (22:30 +0000)]

DO NOT MERGE) ExifInterface: Provide backward compatibility am: c11f599a2f am: 29e643bcbd am: 68aa33b9bf -s ours am: 2a762996cb -s ours am: a8d06257c1 am: 2179b54c9c -s ours am: 279ebd7ffd
am: 7598d6ac9f

Change-Id: I2402e57fc71128787e9b6895cb8f739b68703569

commit | commitdiff | tree

Sungsoo [Thu, 13 Oct 2016 22:29:29 +0000 (22:29 +0000)]

DO NOT MERGE) ExifInterface: Provide backward compatibility am: 87a9ac70c3 am: 11b522b40f -s ours am: 8b764f10c3 am: 29273190f1 am: 7bb855a973 am: 68469a695e -s ours am: b4fdad2b8c
am: 2dc905eb4d

Change-Id: I6703dc3e913257bfcccc48970744616dfac45871

commit | commitdiff | tree

Sungsoo [Thu, 13 Oct 2016 22:27:26 +0000 (22:27 +0000)]

DO NOT MERGE) ExifInterface: Provide backward compatibility am: 7ce9243087 am: bb800841ca am: 016c5889bc am: d6508621fc -s ours am: b576f816c5 am: db77b50424
am: 81fac8a618

Change-Id: Id08e5d7ebfeabd632bcf5d19c97e82ad0031c16e

commit | commitdiff | tree

Sungsoo [Thu, 13 Oct 2016 22:27:00 +0000 (22:27 +0000)]

DO NOT MERGE) ExifInterface: Provide backward compatibility am: 22bd36448e -s ours am: 3992742559 am: 2816a5fa5e -s ours am: 03593fe78f am: ad11872ded am: d3f3729a17
am: 9d675aadf1 -s ours

Change-Id: Ie718673c80156edc6e205ba5e0e68ea785b1e20c

commit | commitdiff | tree

Sungsoo [Thu, 13 Oct 2016 22:26:57 +0000 (22:26 +0000)]

DO NOT MERGE) ExifInterface: Provide backward compatibility am: c11f599a2f am: 29e643bcbd am: 68aa33b9bf -s ours am: 2a762996cb -s ours am: a8d06257c1 am: 2179b54c9c -s ours
am: 279ebd7ffd

Change-Id: I7acd29458a3592cc7895521036d85950afba8e64

commit | commitdiff | tree

Sungsoo [Thu, 13 Oct 2016 22:25:12 +0000 (22:25 +0000)]

DO NOT MERGE) ExifInterface: Provide backward compatibility am: 87a9ac70c3 am: 11b522b40f -s ours am: 8b764f10c3 am: 29273190f1 am: 7bb855a973 am: 68469a695e -s ours
am: b4fdad2b8c

Change-Id: Ic2dfe876cfa1fcf2f8b3480a6810eb4c54db8401

commit | commitdiff | tree

Sungsoo [Thu, 13 Oct 2016 22:22:59 +0000 (22:22 +0000)]

DO NOT MERGE) ExifInterface: Provide backward compatibility am: 7ce9243087 am: bb800841ca am: 016c5889bc am: d6508621fc -s ours am: b576f816c5
am: db77b50424

Change-Id: Id44780752d3feb22bfc3c10b35ffabcc601da1fa

commit | commitdiff | tree

Sungsoo [Thu, 13 Oct 2016 22:22:53 +0000 (22:22 +0000)]

DO NOT MERGE) ExifInterface: Provide backward compatibility am: c11f599a2f am: 29e643bcbd am: 68aa33b9bf -s ours am: 2a762996cb -s ours am: a8d06257c1
am: 2179b54c9c -s ours

Change-Id: I93f44a4deb665e4e5f8695fbc3b3e3a471260c28

commit | commitdiff | tree

Sungsoo [Thu, 13 Oct 2016 22:22:51 +0000 (22:22 +0000)]

DO NOT MERGE) ExifInterface: Provide backward compatibility am: 22bd36448e -s ours am: 3992742559 am: 2816a5fa5e -s ours am: 03593fe78f am: ad11872ded
am: d3f3729a17

Change-Id: I37bdd65d9b241234190f42b927ef4f1ba796490e

commit | commitdiff | tree

Sungsoo [Thu, 13 Oct 2016 22:20:35 +0000 (22:20 +0000)]

DO NOT MERGE) ExifInterface: Provide backward compatibility am: 87a9ac70c3 am: 11b522b40f -s ours am: 8b764f10c3 am: 29273190f1 am: 7bb855a973
am: 68469a695e -s ours

Change-Id: I46494f3d01d4d3888c712d066a8a8658f7dd872d

commit | commitdiff | tree

Sungsoo [Thu, 13 Oct 2016 22:18:44 +0000 (22:18 +0000)]

DO NOT MERGE) ExifInterface: Provide backward compatibility am: 7ce9243087 am: bb800841ca am: 016c5889bc am: d6508621fc -s ours
am: b576f816c5

Change-Id: I8343fb9ee7f33ccbb6b9a0dfc143da95c18b6d08

commit | commitdiff | tree

Sungsoo [Thu, 13 Oct 2016 22:18:36 +0000 (22:18 +0000)]

DO NOT MERGE) ExifInterface: Provide backward compatibility am: c11f599a2f am: 29e643bcbd am: 68aa33b9bf -s ours am: 2a762996cb -s ours
am: a8d06257c1

Change-Id: I5f25f766a472bfddc32aa7ab7e506bc5e5d6854b

commit | commitdiff | tree

Sungsoo [Thu, 13 Oct 2016 22:18:29 +0000 (22:18 +0000)]

DO NOT MERGE) ExifInterface: Provide backward compatibility am: 22bd36448e -s ours am: 3992742559 am: 2816a5fa5e -s ours am: 03593fe78f
am: ad11872ded

Change-Id: Iaf3dd04a8ee9816d00aa932386adf0601ca43360

commit | commitdiff | tree

Sungsoo [Thu, 13 Oct 2016 22:16:57 +0000 (22:16 +0000)]

DO NOT MERGE) ExifInterface: Provide backward compatibility am: 87a9ac70c3 am: 11b522b40f -s ours am: 8b764f10c3 am: 29273190f1
am: 7bb855a973

Change-Id: I0a8abff7747224ab05012b908024bbfeda354f9c

commit | commitdiff | tree

Sungsoo Lim [Thu, 13 Oct 2016 22:13:01 +0000 (22:13 +0000)]

Merge "ExifInterface: Provide backward compatibility" into nyc-dev am: e29077105e am: 9dd9c5a856
am: 5554e0ac16

Change-Id: Ie6b60e245d20b586ee4aeb4549d603c85d6457ee

commit | commitdiff | tree

Sungsoo [Thu, 13 Oct 2016 22:12:07 +0000 (22:12 +0000)]

DO NOT MERGE) ExifInterface: Provide backward compatibility am: 7ce9243087 am: bb800841ca am: 016c5889bc
am: d6508621fc -s ours

Change-Id: Ie77ff477549bbba05151fa3909ba5be26f91e05b

commit | commitdiff | tree

Sungsoo [Thu, 13 Oct 2016 22:12:03 +0000 (22:12 +0000)]

DO NOT MERGE) ExifInterface: Provide backward compatibility am: c11f599a2f am: 29e643bcbd am: 68aa33b9bf -s ours
am: 2a762996cb -s ours

Change-Id: If32418debc774a2f78eae4cc2b3f5b77457bfa1c

commit | commitdiff | tree

Sungsoo [Thu, 13 Oct 2016 22:11:59 +0000 (22:11 +0000)]

DO NOT MERGE) ExifInterface: Provide backward compatibility am: 87a9ac70c3 am: 11b522b40f -s ours am: 8b764f10c3
am: 29273190f1

Change-Id: I8ebc69bc574bdeece4b3f79e36651dfb9965f7a2

commit | commitdiff | tree

Sungsoo [Thu, 13 Oct 2016 22:11:58 +0000 (22:11 +0000)]

DO NOT MERGE) ExifInterface: Provide backward compatibility am: 22bd36448e -s ours am: 3992742559 am: 2816a5fa5e -s ours
am: 03593fe78f

Change-Id: I4e8fb688d568354c7cd53efc170e7e0611862095

commit | commitdiff | tree

Sungsoo [Thu, 13 Oct 2016 22:11:58 +0000 (22:11 +0000)]

ExifInterface: Provide backward compatibility am: 2dbe166801 am: bc813cd510
am: 36f64a2f0c

Change-Id: Ibc82a2ddd80dff7d98880db0a179fbb1540ac6f8

commit | commitdiff | tree

Sungsoo [Thu, 13 Oct 2016 22:07:20 +0000 (22:07 +0000)]

DO NOT MERGE) ExifInterface: Provide backward compatibility am: 7ce9243087 am: bb800841ca
am: 016c5889bc

Change-Id: I03faa540856ba74aff431e287cecc5995b6037bd

commit | commitdiff | tree

Sungsoo Lim [Thu, 13 Oct 2016 22:06:46 +0000 (22:06 +0000)]

Merge "ExifInterface: Provide backward compatibility" into nyc-dev am: e29077105e
am: 9dd9c5a856

Change-Id: I293992f615763762ee6d403a5548d873e4891271

commit | commitdiff | tree

Sungsoo [Thu, 13 Oct 2016 22:06:09 +0000 (22:06 +0000)]

DO NOT MERGE) ExifInterface: Provide backward compatibility am: 87a9ac70c3 am: 11b522b40f -s ours
am: 8b764f10c3

Change-Id: I8bfb9d9be23485f02d808df21c6ddfaed6d0d2b2

commit | commitdiff | tree

Sungsoo [Thu, 13 Oct 2016 22:06:03 +0000 (22:06 +0000)]

DO NOT MERGE) ExifInterface: Provide backward compatibility am: c11f599a2f am: 29e643bcbd
am: 68aa33b9bf -s ours

Change-Id: I7fe3d5dbcb7bd206233ce969840f5ed182913dd6

commit | commitdiff | tree

Sungsoo [Thu, 13 Oct 2016 22:06:01 +0000 (22:06 +0000)]

ExifInterface: Provide backward compatibility am: 2dbe166801
am: bc813cd510

Change-Id: I0aa6d33baeec8dd991561d964bfce16915c0553d

commit | commitdiff | tree

Sungsoo [Thu, 13 Oct 2016 22:06:00 +0000 (22:06 +0000)]

DO NOT MERGE) ExifInterface: Provide backward compatibility am: 22bd36448e -s ours am: 3992742559
am: 2816a5fa5e -s ours

Change-Id: I51df5f3d8e79c31f6c299fdbeec3fbfb9d9a300e

commit | commitdiff | tree

Sungsoo [Thu, 13 Oct 2016 22:01:39 +0000 (22:01 +0000)]

DO NOT MERGE) ExifInterface: Provide backward compatibility am: c11f599a2f
am: 29e643bcbd

Change-Id: I413ba35abfc8999c405df78a40b8182f19472b6a

commit | commitdiff | tree

Sungsoo [Thu, 13 Oct 2016 22:01:22 +0000 (22:01 +0000)]

DO NOT MERGE) ExifInterface: Provide backward compatibility am: 7ce9243087
am: bb800841ca

Change-Id: I93674ad50daa5c3b7411a87112ad33ce199e71ce

commit | commitdiff | tree

Sungsoo [Thu, 13 Oct 2016 22:00:51 +0000 (22:00 +0000)]

DO NOT MERGE) ExifInterface: Provide backward compatibility am: 22bd36448e -s ours
am: 3992742559

Change-Id: I0b7cbc29fa69ff1170e377bd51621c5a5e14f793

commit | commitdiff | tree

Sungsoo [Thu, 13 Oct 2016 21:59:28 +0000 (21:59 +0000)]

DO NOT MERGE) ExifInterface: Provide backward compatibility am: 87a9ac70c3
am: 11b522b40f -s ours

Change-Id: I144aee71338030bd8db42cc8ba8c12976e371762

commit | commitdiff | tree

Sungsoo Lim [Thu, 13 Oct 2016 21:57:26 +0000 (21:57 +0000)]

Merge "ExifInterface: Provide backward compatibility" into nyc-dev
am: e29077105e

Change-Id: I1591f2c41214c14bb85ea90d59e94a44dafe8a77

commit | commitdiff | tree

Sungsoo [Thu, 13 Oct 2016 21:57:22 +0000 (21:57 +0000)]

ExifInterface: Provide backward compatibility
am: 2dbe166801

Change-Id: I53f2bfb056d955c6693cb65c9cb9a21859ff7535

commit | commitdiff | tree

Sungsoo [Thu, 13 Oct 2016 21:57:01 +0000 (21:57 +0000)]

DO NOT MERGE) ExifInterface: Provide backward compatibility
am: 22bd36448e -s ours

Change-Id: I13a49444b80cd07c0cb37f6b8fb514b5b04e61bb

commit | commitdiff | tree

Sungsoo [Thu, 13 Oct 2016 21:56:56 +0000 (21:56 +0000)]

DO NOT MERGE) ExifInterface: Provide backward compatibility
am: c11f599a2f

Change-Id: If503e3361e69ad88a166f145603273d728d65652

commit | commitdiff | tree

Sungsoo [Thu, 13 Oct 2016 21:56:55 +0000 (21:56 +0000)]

DO NOT MERGE) ExifInterface: Provide backward compatibility
am: 7ce9243087

Change-Id: I3d46cccc578160d7da5ff81e0caa09a52a17e9eb

commit | commitdiff | tree

Sungsoo [Thu, 13 Oct 2016 21:54:25 +0000 (21:54 +0000)]

DO NOT MERGE) ExifInterface: Provide backward compatibility
am: 87a9ac70c3

Change-Id: I6639c6763ee1f7d83d03cc6d5fa11cbf1516e7cc

commit | commitdiff | tree

Sungsoo Lim [Thu, 13 Oct 2016 21:46:38 +0000 (21:46 +0000)]

Merge "ExifInterface: Provide backward compatibility" into nyc-dev

commit | commitdiff | tree

Christopher Tate [Thu, 13 Oct 2016 21:13:03 +0000 (21:13 +0000)]

Merge "Only full-data back up regular files + directories" into nyc-mr1-dev
am: b3ca7c26e1

Change-Id: I363cf717193316eaa9ad910284bb3140c6684dbc

commit | commitdiff | tree

Christopher Tate [Thu, 13 Oct 2016 21:13:00 +0000 (21:13 +0000)]

Only full-data back up regular files + directories
am: da2018efeb

Change-Id: I6ecc74ee9613f221e24acca571560bf8190b7073

commit | commitdiff | tree

TreeHugger Robot [Thu, 13 Oct 2016 21:06:56 +0000 (21:06 +0000)]

Merge "Only full-data back up regular files + directories" into nyc-mr1-dev

commit | commitdiff | tree

Greg Plesur [Thu, 13 Oct 2016 21:01:59 +0000 (21:01 +0000)]

Merge "DPM.isProvisioningAllowed(ACTION_PROVISION_MANAGED_DEVICE) should return 'false' for Wear devices after pairing/upgrade." into cw-f-dev

commit | commitdiff | tree

Dianne Hackborn [Thu, 13 Oct 2016 20:36:38 +0000 (20:36 +0000)]

Merge "Fix issue #32125907: Intent.replaceUnsafeExtras() corrupts original bundle" into nyc-mr1-dev
am: 33e56a9e1f

Change-Id: I74c2a5391f8eebf0544447886b14714fbd0202b1

commit | commitdiff | tree

Dianne Hackborn [Thu, 13 Oct 2016 20:31:43 +0000 (20:31 +0000)]

Fix issue #32125907: Intent.replaceUnsafeExtras() corrupts original bundle
am: 851ec49de7

Change-Id: I8a5f8e28f8e4ca7e8fd20abacc0da1dae4055da7

commit | commitdiff | tree

Dianne Hackborn [Thu, 13 Oct 2016 20:21:23 +0000 (20:21 +0000)]

Merge "Fix issue #32125907: Intent.replaceUnsafeExtras() corrupts original bundle" into nyc-mr1-dev

commit | commitdiff | tree

Svetoslav Ganov [Thu, 13 Oct 2016 20:15:19 +0000 (20:15 +0000)]

Merge "Allow SetupWizard to do WiFi scans if location off" into nyc-mr1-dev
am: cba436b312

Change-Id: Iccde94bb855b3461ddb804b69182c439f9c07e1f

commit | commitdiff | tree

Svetoslav Ganov [Thu, 13 Oct 2016 20:15:16 +0000 (20:15 +0000)]

Allow SetupWizard to do WiFi scans if location off
am: b2457c3704

Change-Id: I3afe3d8628e8af5806b03b86ea5c866fd454cddd

commit | commitdiff | tree

Svetoslav Ganov [Thu, 13 Oct 2016 20:06:00 +0000 (20:06 +0000)]

Merge "Allow SetupWizard to do WiFi scans if location off" into nyc-mr1-dev

commit | commitdiff | tree

Christopher Tate [Thu, 13 Oct 2016 19:12:29 +0000 (12:12 -0700)]

Only full-data back up regular files + directories

Ignore every filesystem entity that is not a regular file or directory.
In particular, we now ignore not only symlinks but also sockets, pipes,
et cetera.

Bug 32143362

Change-Id: If51b54df1f7a643af145eb15bf12d389d19f8780

commit | commitdiff | tree

Greg Plesur [Mon, 10 Oct 2016 20:23:49 +0000 (16:23 -0400)]

DPM.isProvisioningAllowed(ACTION_PROVISION_MANAGED_DEVICE) should
return 'false' for Wear devices after pairing/upgrade.

BUG: 32019375
Change-Id: I2563efe58c98c5dd8440891e478c89e093d8d9ac

commit | commitdiff | tree

Chris Tate [Thu, 13 Oct 2016 19:04:43 +0000 (19:04 +0000)]

Merge "Retain allowBackup annotation when system+lock wallpaper becomes lock only" into nyc-mr1-dev
am: 4bd56fbbee

Change-Id: I19fae35338016bbbb7de07e8c9d978bab2e088fe

commit | commitdiff | tree

Christopher Tate [Thu, 13 Oct 2016 19:04:40 +0000 (19:04 +0000)]

Retain allowBackup annotation when system+lock wallpaper becomes lock only
am: edd8dc83d5

Change-Id: I2f3a6587bb7f53517232cf051a345e2c617b3778

commit | commitdiff | tree

Chris Tate [Thu, 13 Oct 2016 18:51:10 +0000 (18:51 +0000)]

Merge "Retain allowBackup annotation when system+lock wallpaper becomes lock only" into nyc-mr1-dev

commit | commitdiff | tree

Bert McMeen [Thu, 13 Oct 2016 18:03:31 +0000 (18:03 +0000)]

Docs: Updates to the Download/Test file related to watch setup am: 137c545e4e am: 58425dc58d
am: 669537a9fe

Change-Id: Ie8e8b14c46ccfda8824dccfdbf2dc3029661ad0b

commit | commitdiff | tree

Bert McMeen [Thu, 13 Oct 2016 17:50:57 +0000 (17:50 +0000)]

Docs: Updates to the Download/Test file related to watch setup am: 137c545e4e
am: 58425dc58d

Change-Id: Icf36fd2b6c4b2489a7197d32392c4a6382a934c3

commit | commitdiff | tree

Bert McMeen [Thu, 13 Oct 2016 17:38:59 +0000 (17:38 +0000)]

Docs: Updates to the Download/Test file related to watch setup
am: 137c545e4e

Change-Id: Ic605d9d26c60e3dd01cd4a9993a6d50d5cfdd94c

commit | commitdiff | tree

Vladislav Kuzkokov [Thu, 13 Oct 2016 08:41:55 +0000 (08:41 +0000)]

Merge "Revert "Fix backup for users hit by erroneous backup disabling"" into nyc-mr1-dev
am: b24489e20a

Change-Id: Ie0f53964c521c89217347be67c16b8fe73ccc09d

commit | commitdiff | tree

Vladislav Kuzkokov [Thu, 13 Oct 2016 08:41:52 +0000 (08:41 +0000)]

Revert "Fix backup for users hit by erroneous backup disabling"
am: 9f61d17e6a

Change-Id: I460fbb670fbc7a724c981c4fceae0048ff4c9ded

commit | commitdiff | tree

Vladislav Kuzkokov [Thu, 13 Oct 2016 08:34:16 +0000 (08:34 +0000)]

Merge "Revert "Fix backup for users hit by erroneous backup disabling"" into nyc-mr1-dev

commit | commitdiff | tree

Julius D'souza [Thu, 13 Oct 2016 07:43:17 +0000 (07:43 +0000)]

Merge "DO NOT MERGE: Ambient light sensor changes for doze mode." into cw-f-dev

commit | commitdiff | tree

Julius D'souza [Tue, 4 Oct 2016 18:05:56 +0000 (11:05 -0700)]

DO NOT MERGE: Ambient light sensor changes for doze mode.

Bug: 18573988

Change-Id: I07eed120bdbefd23408921405466566da33c397d

commit | commitdiff | tree

Andrii Kulian [Thu, 13 Oct 2016 05:01:15 +0000 (05:01 +0000)]

Merge "DO NOT MERGE -- Adjust focus when moving task back" into nyc-mr1-dev
am: 1fefc8b9fa

Change-Id: I57af7dceec243b6befbaa293438d6239053bb0ed

commit | commitdiff | tree

Andrii Kulian [Thu, 13 Oct 2016 05:01:11 +0000 (05:01 +0000)]

DO NOT MERGE -- Adjust focus when moving task back
am: d4b98705b5

Change-Id: I1d07e84360ef0bfeb6b0ce41466e4042ca70ad81

commit | commitdiff | tree

TreeHugger Robot [Thu, 13 Oct 2016 04:47:44 +0000 (04:47 +0000)]

Merge "DO NOT MERGE -- Adjust focus when moving task back" into nyc-mr1-dev

commit | commitdiff | tree

Sungsoo [Thu, 13 Oct 2016 03:57:44 +0000 (12:57 +0900)]

ExifInterface: Provide backward compatibility

ExifInterface.saveAttribute() didn't throw UnsupportedOperationException
before. Use IOException instead of UnsupportedOperationException for
backward compatibility.

Bug: 30936376, Bug: 32068647, Bug: 31319086
Change-Id: Ifb478db3af820eb846c5373d3a284367da3495a0

commit | commitdiff | tree

Sungsoo [Thu, 13 Oct 2016 03:24:16 +0000 (12:24 +0900)]

DO NOT MERGE) ExifInterface: Provide backward compatibility

ExifInterface.saveAttribute() didn't throw UnsupportedOperationException
before. Use IOException instead of UnsupportedOperationException for
backward compatibility.

Bug: 30936376, Bug: 32068647, Bug: 31319086
Change-Id: Iacc7b4d91d49edd7bece8f2e738a633a91025eca

commit | commitdiff | tree

Sungsoo [Thu, 13 Oct 2016 03:24:16 +0000 (12:24 +0900)]

commit | commitdiff | tree

Sungsoo [Thu, 13 Oct 2016 03:24:16 +0000 (12:24 +0900)]

commit | commitdiff | tree

Sungsoo [Thu, 13 Oct 2016 03:24:16 +0000 (12:24 +0900)]

commit | commitdiff | tree

Andrii Kulian [Wed, 12 Oct 2016 21:23:19 +0000 (14:23 -0700)]

DO NOT MERGE -- Adjust focus when moving task back

Resumed and focused activity should be adjusted simultaneously.
This was missing when task was moved back and focus was adjusted only
after previous activity stopped.

Bug: 31983988
Change-Id: Ie6c908b0c8c1adf94680b42ca5a8c9b01308e361

commit | commitdiff | tree

Robert Carr [Thu, 13 Oct 2016 02:15:33 +0000 (02:15 +0000)]

Merge "Correct recently introduced logic error in seamless rotation detection." into nyc-mr1-dev
am: 1553d5411c

Change-Id: I9e12db9f686c934a2e2d391d80a0c1bb26398c7f

commit | commitdiff | tree

Robert Carr [Thu, 13 Oct 2016 02:15:31 +0000 (02:15 +0000)]

Correct recently introduced logic error in seamless rotation detection.
am: e441e7f15f

Change-Id: I3e9bdef49a3749e82dbed82bc230bcaac958608a

commit | commitdiff | tree

TreeHugger Robot [Thu, 13 Oct 2016 02:05:30 +0000 (02:05 +0000)]

Merge "Correct recently introduced logic error in seamless rotation detection." into nyc-mr1-dev

commit | commitdiff | tree

Dianne Hackborn [Thu, 13 Oct 2016 00:20:07 +0000 (17:20 -0700)]

Fix issue #32125907: Intent.replaceUnsafeExtras() corrupts original bundle

We now recursively generate new Bundle objects if we need to
do any stripping.

Change-Id: I4ca7896a0771c25264591ae7c79df85816d630d4

commit | commitdiff | tree

Selim Cinek [Thu, 13 Oct 2016 00:44:21 +0000 (00:44 +0000)]

Merge "Fixed a bug where the system could crash when expanding" into nyc-mr1-dev
am: 0bdfc7be66

Change-Id: Ic63b6f6bf187ea632a05a6524d3b0f8bef376b74

commit | commitdiff | tree

Selim Cinek [Thu, 13 Oct 2016 00:44:16 +0000 (00:44 +0000)]

Fixed a bug where the system could crash when expanding
am: 3e77984434

Change-Id: Icf8c8743f57a5e402275adfc645f08a10cf94a3b

commit | commitdiff | tree

Selim Cinek [Thu, 13 Oct 2016 00:42:47 +0000 (00:42 +0000)]

Merge "Fix crashes after notifying bad notification" into nyc-mr1-dev
am: d517c3c16b

Change-Id: I07d4f185a096c22628cd0d0ffcb789391a81f518

commit | commitdiff | tree

dooyoung.hwang [Thu, 13 Oct 2016 00:42:44 +0000 (00:42 +0000)]

Fix crashes after notifying bad notification
am: 78c4114101

Change-Id: I4d72feb9a40b99c5b40307ad01d708b3a66d1f54

commit | commitdiff | tree

Selim Cinek [Thu, 13 Oct 2016 00:41:27 +0000 (00:41 +0000)]

Merge "Fixed an issue where the emergency affordance would show" into nyc-mr1-dev
am: 7ce68fd8a4

Change-Id: I775e64348075fe1dd57a7133fcdc7b11f79415d6

commit | commitdiff | tree

Selim Cinek [Thu, 13 Oct 2016 00:41:24 +0000 (00:41 +0000)]

Fixed an issue where the emergency affordance would show
am: bd740cd56a

Change-Id: I6ce705cc701bf149dec45feabcf4777cc89afa6a

commit | commitdiff | tree

Selim Cinek [Thu, 13 Oct 2016 00:37:27 +0000 (00:37 +0000)]

Merge "Fixed a bug where the system could crash when expanding" into nyc-mr1-dev

commit | commitdiff | tree

Selim Cinek [Thu, 13 Oct 2016 00:36:27 +0000 (00:36 +0000)]

Merge "Fix crashes after notifying bad notification" into nyc-mr1-dev

commit | commitdiff | tree

Selim Cinek [Thu, 13 Oct 2016 00:29:57 +0000 (00:29 +0000)]

Merge "Fixed an issue where the emergency affordance would show" into nyc-mr1-dev

commit | commitdiff | tree

Christopher Tate [Wed, 12 Oct 2016 22:17:58 +0000 (15:17 -0700)]

Retain allowBackup annotation when system+lock wallpaper becomes lock only

Bug 32069467

Change-Id: I5d0b91c40e1a2896f2b11efeef7bff84503cf2c0

commit | commitdiff | tree

Adrian Roos [Wed, 12 Oct 2016 23:19:22 +0000 (23:19 +0000)]

Merge "Fix Notification.Action.Builder copy constructor" into nyc-mr1-dev
am: 5c8fc58850

Change-Id: Ic9b035247f5b09582adf20c7cb47361f7b035cf7

commit | commitdiff | tree

Adrian Roos [Wed, 12 Oct 2016 23:19:19 +0000 (23:19 +0000)]

Fix Notification.Action.Builder copy constructor
am: 7af5362571

Change-Id: I0853e663b1895e2c45fad17cfee79202f3b14ef7

commit | commitdiff | tree

TreeHugger Robot [Wed, 12 Oct 2016 23:11:20 +0000 (23:11 +0000)]

Merge "Fix Notification.Action.Builder copy constructor" into nyc-mr1-dev

commit | commitdiff | tree

Adrian Roos [Wed, 12 Oct 2016 20:44:05 +0000 (13:44 -0700)]

Fix Notification.Action.Builder copy constructor

The copy constructor of Notification.Action.Builder did not copy
the mAllowGeneratedReplies field.

Change-Id: I40fbe8950ee2232e2589ab3930a32bfbebe9fc89
Fixes: 31766718
Test: runtest --path $T/cts/tests/app/src/android/app/cts/NotificationTest.java