OSDN Git Service

android-x86/frameworks-base.git
7 years agoMerge "DO NOT MERGE Isolated processes don't get precached system service binders...
Christopher Tate [Sat, 15 Oct 2016 00:38:07 +0000 (00:38 +0000)]
Merge "DO NOT MERGE Isolated processes don't get precached system service binders" into nyc-dev am: 3af8419137
am: d0c65faeb1

Change-Id: I964c6f4c1c270d4e020da36c82307e1f7c12f46d

7 years agoDO NOT MERGE Isolated processes don't get precached system service binders am: 477963198a
Christopher Tate [Sat, 15 Oct 2016 00:37:19 +0000 (00:37 +0000)]
DO NOT MERGE Isolated processes don't get precached system service binders am: 477963198a
am: 32a4c2599f

Change-Id: Ia14be15da964e002e8e4c60ba5259142f6e3aebd

7 years agoMerge "Handle exceptions from #requestPermission()" into nyc-mr1-dev
Yohei Yukawa [Sat, 15 Oct 2016 00:31:19 +0000 (00:31 +0000)]
Merge "Handle exceptions from #requestPermission()" into nyc-mr1-dev

7 years agoMerge "DO NOT MERGE Isolated processes don't get precached system service binders...
Christopher Tate [Sat, 15 Oct 2016 00:29:58 +0000 (00:29 +0000)]
Merge "DO NOT MERGE Isolated processes don't get precached system service binders" into nyc-dev
am: 3af8419137

Change-Id: If970889a7c146a77eb1c6c85e0d49393635cc81d

7 years agoDO NOT MERGE Isolated processes don't get precached system service binders
Christopher Tate [Sat, 15 Oct 2016 00:29:56 +0000 (00:29 +0000)]
DO NOT MERGE Isolated processes don't get precached system service binders
am: 477963198a

Change-Id: Ia908cf6fa470678d9f2a07b55033a7a1dbc8b1a0

7 years agoMerge "DO NOT MERGE Isolated processes don't get precached system service binders...
TreeHugger Robot [Sat, 15 Oct 2016 00:23:35 +0000 (00:23 +0000)]
Merge "DO NOT MERGE Isolated processes don't get precached system service binders" into nyc-dev

7 years agoMerge "Add API 25 to @since list." into nyc-mr1-dev
TreeHugger Robot [Sat, 15 Oct 2016 00:09:05 +0000 (00:09 +0000)]
Merge "Add API 25 to @since list." into nyc-mr1-dev

7 years agoDO NOT MERGE Isolated processes don't get precached system service binders
Christopher Tate [Tue, 16 Aug 2016 23:03:44 +0000 (16:03 -0700)]
DO NOT MERGE Isolated processes don't get precached system service binders

More specifically, they get a PackageManager binder -- necessary for
Android process startup and configuration -- but none of the other
usual preloaded service binders.

Bug 30202228

Change-Id: I3810649f504cd631665ece338a83d2e54d41ad05
(cherry picked from commit 2c61c57ac53cbb270b4e76b9d04465f8a3f6eadc)

7 years agoMerge "Update DisplayMetrics even on default display" into nyc-mr1-dev
Adam Lesinski [Fri, 14 Oct 2016 22:28:13 +0000 (22:28 +0000)]
Merge "Update DisplayMetrics even on default display" into nyc-mr1-dev

7 years agoHandle exceptions from #requestPermission()
Yohei Yukawa [Fri, 14 Oct 2016 07:07:59 +0000 (00:07 -0700)]
Handle exceptions from #requestPermission()

This is a follow up CL to my previous CL [1] that let
IInputConnectionWrapper to call InputContentInfo#requestPermission()
automatically so that temporary URI permissions can be granted
automatically on API 25+ devices whenever
INPUT_CONTENT_GRANT_READ_URI_PERMISSION is specified.

However, in that CL we forgot to handle exceptions thrown from
InputContentInfo#requestPermission().  This is problematic because it is
actually easy for IMEs to cause SecurityException by specifying a
content URI that does not allow grantUriPermission, e.g.:

  inputConnection.commitContent(
          new InputContentInfo(Uri.parse("content://call_log/test"),
          new ClipDescription("test", new String[]{"image/gif"}));

As a result, IMEs can let the application crash at any time because
InputContentInfo#requestPermission() is automatically called inside the
Framework.

This CL makes sure that exceptions thrown from
InputContentInfo#requestPermission() can be handled gracefully.

 [1]: Id955435dd2e72549ee7134f46b3c6951581694ad
      f3806f57a59ede663f3fa2ad1f5080bdbf20e372

Bug: 32162481
Change-Id: I08916a1f54518390d3b67ab1673dc901e3f9716a

7 years agoMerge "Docs: Fixed the menu navigation instructions" into nyc-dev am: 5b2493a655
Hemal Patel [Fri, 14 Oct 2016 22:11:42 +0000 (22:11 +0000)]
Merge "Docs: Fixed the menu navigation instructions" into nyc-dev am: 5b2493a655
am: 52b9db5a82

Change-Id: I9e7093c33b8409f88ba5a9319a417c2e89fc7342

7 years agoDocs: Fixed the menu navigation instructions am: c29dac71c0
Hemal Patel [Fri, 14 Oct 2016 22:10:34 +0000 (22:10 +0000)]
Docs: Fixed the menu navigation instructions am: c29dac71c0
am: c2a22f3b41

Change-Id: Ic96f48238e790f925caf7d666681d865deeacf11

7 years agoMerge "Docs: Fixed the menu navigation instructions" into nyc-dev
Hemal Patel [Fri, 14 Oct 2016 22:02:15 +0000 (22:02 +0000)]
Merge "Docs: Fixed the menu navigation instructions" into nyc-dev
am: 5b2493a655

Change-Id: I7fdb0dabb7f530c71e4331261fbac874eea36da9

7 years agoDocs: Fixed the menu navigation instructions
Hemal Patel [Fri, 14 Oct 2016 22:02:10 +0000 (22:02 +0000)]
Docs: Fixed the menu navigation instructions
am: c29dac71c0

Change-Id: I0f22649ba3c4dbbca06e5d5087d6fde6737a8467

7 years agoMerge "Docs: Fixed the menu navigation instructions" into nyc-dev
Hemal Patel [Fri, 14 Oct 2016 21:52:44 +0000 (21:52 +0000)]
Merge "Docs: Fixed the menu navigation instructions" into nyc-dev

7 years agoFix launching alarm pending intent am: d0408f0028
Jason Monk [Fri, 14 Oct 2016 18:54:00 +0000 (18:54 +0000)]
Fix launching alarm pending intent am: d0408f0028
am: 9042736ff1

Change-Id: Id2c2ccf79c62c5e0e498259a2b88e44cb98a70b3

7 years agoFix launching alarm pending intent
Jason Monk [Fri, 14 Oct 2016 18:46:44 +0000 (18:46 +0000)]
Fix launching alarm pending intent
am: d0408f0028

Change-Id: I01f3963617638bf8c1cb8efccf027dd8a9084517

7 years agoUpdate DisplayMetrics even on default display
Adam Lesinski [Fri, 14 Oct 2016 18:10:29 +0000 (11:10 -0700)]
Update DisplayMetrics even on default display

Fix a bug where the DisplayMetrics wouldn't be updated for a Resources
object on the default display. Since multi-window, we want to update
all Resources.

This didn't always manifest itself due to recreation of assets, which
would force an update of DisplayMetrics. Re-use of an AssetManager from
the cache would expose the bug.

Bug:32133693
Bug:31998629
Test: cts-tradefed run cts --module CtsServicesHostTestCases
Change-Id: Ic51ab82710517b87eb995ccf982085dba876ad58

7 years agoAdd API 25 to @since list.
Dirk Dougherty [Fri, 14 Oct 2016 17:27:08 +0000 (10:27 -0700)]
Add API 25 to @since list.

Change-Id: I636c8e948530d4aa3900496f042f54beb57da15a

7 years agoFix launching alarm pending intent
Jason Monk [Fri, 14 Oct 2016 14:46:37 +0000 (10:46 -0400)]
Fix launching alarm pending intent

Launch it as a pending intent.

Change-Id: I2adf9347facb9c6fb58cbf8549233c34fcc87350
Fixes: 23909438

7 years agoMerge "Import translations. DO NOT MERGE" into nyc-mr1-dev
TreeHugger Robot [Fri, 14 Oct 2016 09:12:50 +0000 (09:12 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev

7 years agoMerge "Import translations. DO NOT MERGE" into nyc-mr1-dev
TreeHugger Robot [Fri, 14 Oct 2016 09:04:59 +0000 (09:04 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev

7 years agoMerge "Import translations. DO NOT MERGE" into nyc-mr1-dev
TreeHugger Robot [Fri, 14 Oct 2016 09:04:08 +0000 (09:04 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev

7 years agoImport translations. DO NOT MERGE
Bill Yi [Fri, 14 Oct 2016 06:17:12 +0000 (23:17 -0700)]
Import translations. DO NOT MERGE

Change-Id: I76af7719d843ed75ebd7952186ea2a38e58195b9
Auto-generated-cl: translation import

7 years agoImport translations. DO NOT MERGE
Bill Yi [Fri, 14 Oct 2016 06:06:12 +0000 (23:06 -0700)]
Import translations. DO NOT MERGE

Change-Id: Id8ce479a4a98e715a350930a515acd543c59a71e
Auto-generated-cl: translation import

7 years agoMerge "DO NOT MERGE: Not to crash DocumentsUI if moving cursor fails." into nyc-mr1-dev
TreeHugger Robot [Fri, 14 Oct 2016 00:02:31 +0000 (00:02 +0000)]
Merge "DO NOT MERGE: Not to crash DocumentsUI if moving cursor fails." into nyc-mr1-dev

7 years agoMerge "Removing a mimeIcon specific for album folders from MediaProvider." into nyc...
Ben Lin [Thu, 13 Oct 2016 23:45:27 +0000 (23:45 +0000)]
Merge "Removing a mimeIcon specific for album folders from MediaProvider." into nyc-mr1-dev

7 years agoDO NOT MERGE) ExifInterface: Provide backward compatibility am: c11f599a2f am: 29e643...
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

7 years agoMerge "Don't expose default strong auth timeout as constant" into nyc-mr1-dev
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

7 years agoDO NOT MERGE) ExifInterface: Provide backward compatibility am: c11f599a2f am: 29e643...
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

7 years agoDO NOT MERGE) ExifInterface: Provide backward compatibility am: c11f599a2f am: 29e643...
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

7 years agoDO NOT MERGE) ExifInterface: Provide backward compatibility am: 22bd36448e -s ours...
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

7 years agoDO NOT MERGE) ExifInterface: Provide backward compatibility am: c11f599a2f am: 29e643...
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

7 years agoDO NOT MERGE) ExifInterface: Provide backward compatibility am: 22bd36448e -s ours...
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

7 years agoDO NOT MERGE) ExifInterface: Provide backward compatibility am: c11f599a2f am: 29e643...
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

7 years agoDO NOT MERGE) ExifInterface: Provide backward compatibility am: 87a9ac70c3 am: 11b522...
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

7 years agoDO NOT MERGE) ExifInterface: Provide backward compatibility am: 22bd36448e -s ours...
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

7 years agoDO NOT MERGE) ExifInterface: Provide backward compatibility am: c11f599a2f am: 29e643...
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

7 years agoDO NOT MERGE) ExifInterface: Provide backward compatibility am: 87a9ac70c3 am: 11b522...
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

7 years agoDO NOT MERGE) ExifInterface: Provide backward compatibility am: 7ce9243087 am: bb8008...
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

7 years agoDO NOT MERGE) ExifInterface: Provide backward compatibility am: c11f599a2f am: 29e643...
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

7 years agoDO NOT MERGE) ExifInterface: Provide backward compatibility am: 22bd36448e -s ours...
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

7 years agoDO NOT MERGE) ExifInterface: Provide backward compatibility am: 87a9ac70c3 am: 11b522...
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

7 years agoDO NOT MERGE) ExifInterface: Provide backward compatibility am: 7ce9243087 am: bb8008...
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

7 years agoDO NOT MERGE) ExifInterface: Provide backward compatibility am: c11f599a2f am: 29e643...
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

7 years agoDO NOT MERGE) ExifInterface: Provide backward compatibility am: 22bd36448e -s ours...
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

7 years agoDO NOT MERGE) ExifInterface: Provide backward compatibility am: 87a9ac70c3 am: 11b522...
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

7 years agoDO NOT MERGE) ExifInterface: Provide backward compatibility am: 7ce9243087 am: bb8008...
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

7 years agoDO NOT MERGE) ExifInterface: Provide backward compatibility am: c11f599a2f am: 29e643...
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

7 years agoDO NOT MERGE) ExifInterface: Provide backward compatibility am: 87a9ac70c3 am: 11b522...
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

7 years agoDO NOT MERGE) ExifInterface: Provide backward compatibility am: 22bd36448e -s ours...
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

7 years agoDO NOT MERGE) ExifInterface: Provide backward compatibility am: 7ce9243087 am: bb800841ca
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

7 years agoMerge "ExifInterface: Provide backward compatibility" into nyc-dev am: e29077105e
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

7 years agoDO NOT MERGE) ExifInterface: Provide backward compatibility am: 87a9ac70c3 am: 11b522...
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

7 years agoDO NOT MERGE) ExifInterface: Provide backward compatibility am: c11f599a2f am: 29e643bcbd
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

7 years agoExifInterface: Provide backward compatibility am: 2dbe166801
Sungsoo [Thu, 13 Oct 2016 22:06:01 +0000 (22:06 +0000)]
ExifInterface: Provide backward compatibility am: 2dbe166801
am: bc813cd510

Change-Id: I0aa6d33baeec8dd991561d964bfce16915c0553d

7 years agoDO NOT MERGE) ExifInterface: Provide backward compatibility am: 22bd36448e -s ours...
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

7 years agoDO NOT MERGE) ExifInterface: Provide backward compatibility am: c11f599a2f
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

7 years agoDO NOT MERGE) ExifInterface: Provide backward compatibility am: 7ce9243087
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

7 years agoDO NOT MERGE) ExifInterface: Provide backward compatibility am: 22bd36448e -s ours
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

7 years agoDO NOT MERGE) ExifInterface: Provide backward compatibility am: 87a9ac70c3
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

7 years agoImport translations. DO NOT MERGE
Bill Yi [Thu, 13 Oct 2016 21:58:39 +0000 (14:58 -0700)]
Import translations. DO NOT MERGE

Change-Id: I825794cb543e17e2a5d2444c15a1dfdbdb048e23
Auto-generated-cl: translation import

7 years agoMerge "ExifInterface: Provide backward compatibility" into nyc-dev
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

7 years agoExifInterface: Provide backward compatibility
Sungsoo [Thu, 13 Oct 2016 21:57:22 +0000 (21:57 +0000)]
ExifInterface: Provide backward compatibility
am: 2dbe166801

Change-Id: I53f2bfb056d955c6693cb65c9cb9a21859ff7535

7 years agoDO NOT MERGE) ExifInterface: Provide backward compatibility
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

7 years agoDO NOT MERGE) ExifInterface: Provide backward compatibility
Sungsoo [Thu, 13 Oct 2016 21:56:56 +0000 (21:56 +0000)]
DO NOT MERGE) ExifInterface: Provide backward compatibility
am: c11f599a2f

Change-Id: If503e3361e69ad88a166f145603273d728d65652

7 years agoDO NOT MERGE) ExifInterface: Provide backward compatibility
Sungsoo [Thu, 13 Oct 2016 21:56:55 +0000 (21:56 +0000)]
DO NOT MERGE) ExifInterface: Provide backward compatibility
am: 7ce9243087

Change-Id: I3d46cccc578160d7da5ff81e0caa09a52a17e9eb

7 years agoDO NOT MERGE) ExifInterface: Provide backward compatibility
Sungsoo [Thu, 13 Oct 2016 21:54:25 +0000 (21:54 +0000)]
DO NOT MERGE) ExifInterface: Provide backward compatibility
am: 87a9ac70c3

Change-Id: I6639c6763ee1f7d83d03cc6d5fa11cbf1516e7cc

7 years agoMerge "ExifInterface: Provide backward compatibility" into nyc-dev
Sungsoo Lim [Thu, 13 Oct 2016 21:46:38 +0000 (21:46 +0000)]
Merge "ExifInterface: Provide backward compatibility" into nyc-dev

7 years agoMerge "Only full-data back up regular files + directories" into nyc-mr1-dev
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

7 years agoMerge "Fix issue #32125907: Intent.replaceUnsafeExtras() corrupts original bundle...
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

7 years agoMerge "Allow SetupWizard to do WiFi scans if location off" into nyc-mr1-dev
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

7 years agoOnly full-data back up regular files + directories
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

7 years agoMerge "Retain allowBackup annotation when system+lock wallpaper becomes lock only...
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

7 years agoDocs: Updates to the Download/Test file related to watch setup am: 137c545e4e
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

7 years agoDocs: Updates to the Download/Test file related to watch setup
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

7 years agoMerge "Revert "Fix backup for users hit by erroneous backup disabling"" into nyc...
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

7 years agoMerge "DO NOT MERGE -- Adjust focus when moving task back" into nyc-mr1-dev
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

7 years agoExifInterface: Provide backward compatibility
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

7 years agoDO NOT MERGE) ExifInterface: Provide backward compatibility
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

7 years agoDO NOT MERGE) ExifInterface: Provide backward compatibility
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

7 years agoDO NOT MERGE) ExifInterface: Provide backward compatibility
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

7 years agoDO NOT MERGE) ExifInterface: Provide backward compatibility
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

7 years agoDO NOT MERGE -- Adjust focus when moving task back
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

7 years agoMerge "Correct recently introduced logic error in seamless rotation detection." into...
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

7 years agoFix issue #32125907: Intent.replaceUnsafeExtras() corrupts original bundle
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

7 years agoMerge "Fixed a bug where the system could crash when expanding" into nyc-mr1-dev
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

7 years agoMerge "Fix crashes after notifying bad notification" into nyc-mr1-dev
Selim Cinek [Thu, 13 Oct 2016 00:36:27 +0000 (00:36 +0000)]
Merge "Fix crashes after notifying bad notification" into nyc-mr1-dev

7 years agoMerge "Fixed an issue where the emergency affordance would show" into nyc-mr1-dev
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

7 years agoRetain allowBackup annotation when system+lock wallpaper becomes lock only
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

7 years agoMerge "Fix Notification.Action.Builder copy constructor" into nyc-mr1-dev
TreeHugger Robot [Wed, 12 Oct 2016 23:11:20 +0000 (23:11 +0000)]
Merge "Fix Notification.Action.Builder copy constructor" into nyc-mr1-dev

7 years agoFix Notification.Action.Builder copy constructor
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

7 years agoMerge "RRO: Synchronize access to overlays.list" into nyc-mr1-dev
Adam Lesinski [Wed, 12 Oct 2016 20:55:53 +0000 (20:55 +0000)]
Merge "RRO: Synchronize access to overlays.list" into nyc-mr1-dev

7 years agoMerge "Fix SkShader leak for Gradient VectorDrawable and test" into nyc-mr1-dev
Doris Liu [Wed, 12 Oct 2016 20:44:47 +0000 (20:44 +0000)]
Merge "Fix SkShader leak for Gradient VectorDrawable and test" into nyc-mr1-dev

7 years agoCorrect recently introduced logic error in seamless rotation detection.
Robert Carr [Wed, 12 Oct 2016 19:48:13 +0000 (12:48 -0700)]
Correct recently introduced logic error in seamless rotation detection.

The code detecting whether we should rotate seamlessly (which for
example we do not support for 180 degree rotations) was moved to before
mRotation was updated, so it was always passing the same value for old
and new rotation, and we were failing to perform the 180 degree rotation
check. Correct this.

Test: Rotate the device 180 degrees at once while in Camera. Things look ok.
Bug: 32025371
Change-Id: I0ef08e8cc4e5d87fdff6d839381196c2b52e71d5

7 years agoDocs: Updates to the Download/Test file related to watch setup
Bert McMeen [Tue, 11 Oct 2016 22:50:54 +0000 (15:50 -0700)]
Docs: Updates to the Download/Test file related to watch setup

Bug: 32091353
Change-Id: I8b70b33c537c2edbaf0fbd09e62dc9564f03cd07

7 years agoDO NOT MERGE: Not to crash DocumentsUI if moving cursor fails.
Garfield Tan [Wed, 12 Oct 2016 00:24:16 +0000 (17:24 -0700)]
DO NOT MERGE: Not to crash DocumentsUI if moving cursor fails.

Bug: 31945164
Bug: 30348114
Change-Id: I3ac675c83379dc269ca8e0ff1678dc3979df5252

7 years agoFixed a bug where the system could crash when expanding
Selim Cinek [Wed, 12 Oct 2016 18:34:52 +0000 (11:34 -0700)]
Fixed a bug where the system could crash when expanding

When expanding a notification it could disappear and the
system would crash.

Test: Manual, expand notification group and have it removed while
doing so.
Change-Id: I421ab0cf7a9292e6894529c80784ba0989071fb0
Fixes: 31941185

7 years agoMerge "Add a delay before scheduling local syncs" into nyc-mr1-dev
Shreyas Basarge [Wed, 12 Oct 2016 17:09:53 +0000 (17:09 +0000)]
Merge "Add a delay before scheduling local syncs" into nyc-mr1-dev

7 years agoFixed an issue where the emergency affordance would show
Selim Cinek [Tue, 11 Oct 2016 19:49:48 +0000 (12:49 -0700)]
Fixed an issue where the emergency affordance would show

If a device isn't voice capable, it shouldn't show the emergency
option.

Test: use tablet which isn't voice capable, insert indian sim and
make sure no emergency option is displayed in global actions.
Bug: 31953703
Change-Id: I351e87320f3ffec76d1c1fc5aac78e5c48c0ac54