OSDN Git Service

android-x86/frameworks-base.git
7 years agoDO NOT MERGE Isolated processes don't get precached system service binders am: 190e66...
Christopher Tate [Sat, 15 Oct 2016 01:25:22 +0000 (01:25 +0000)]
DO NOT MERGE Isolated processes don't get precached system service binders am: 190e66685f am: eafeb8becf  -s ours am: 1d86a376c8 am: f2e19dd663 am: 5a4af6ab3a am: 851fd50a07  -s ours am: 690f73f1a1
am: bba4dc9556

Change-Id: Ia56573cec4c0d25104f2ad2bb04b7b62d04890fe

7 years agoDO NOT MERGE Isolated processes don't get precached system service binders am: 190e66...
Christopher Tate [Sat, 15 Oct 2016 01:18:37 +0000 (01:18 +0000)]
DO NOT MERGE Isolated processes don't get precached system service binders am: 190e66685f am: eafeb8becf  -s ours am: 1d86a376c8 am: f2e19dd663 am: 5a4af6ab3a am: 851fd50a07  -s ours
am: 690f73f1a1

Change-Id: I019ff64d70b7e2f4b7f2f9f6bc12c41a3928eccd

7 years agoDO NOT MERGE Isolated processes don't get precached system service binders am: 190e66...
Christopher Tate [Sat, 15 Oct 2016 01:10:20 +0000 (01:10 +0000)]
DO NOT MERGE Isolated processes don't get precached system service binders am: 190e66685f am: eafeb8becf  -s ours am: 1d86a376c8 am: f2e19dd663 am: 5a4af6ab3a
am: 851fd50a07  -s ours

Change-Id: Ie35fe5f230b63840b1e814563a25b484e2541fc9

7 years agoMerge "DO NOT MERGE Isolated processes don't get precached system service binders...
Christopher Tate [Sat, 15 Oct 2016 01:07:35 +0000 (01:07 +0000)]
Merge "DO NOT MERGE Isolated processes don't get precached system service binders" into mnc-dev am: 7b685d4c39 am: ea75bae8c8 am: 3fa004554c am: 8169e87f25  -s ours am: a026501af8
am: e3b8d697cc

Change-Id: Ib5654a50f8f1f71866ec3fce7998b4a830c43052

7 years agoDO NOT MERGE Isolated processes don't get precached system service binders am: f4d23f...
Christopher Tate [Sat, 15 Oct 2016 01:06:47 +0000 (01:06 +0000)]
DO NOT MERGE Isolated processes don't get precached system service binders am: f4d23f30c9 am: f93e1f2671 am: 7044826aa8 am: 25c278dcbf  -s ours am: db3446aa0f
am: 73549cb683

Change-Id: I39071b3e3e336ee4888a8a60d84a454a74f8c023

7 years agoDO NOT MERGE Isolated processes don't get precached system service binders am: 190e66...
Christopher Tate [Sat, 15 Oct 2016 01:03:09 +0000 (01:03 +0000)]
DO NOT MERGE Isolated processes don't get precached system service binders am: 190e66685f am: eafeb8becf  -s ours am: 1d86a376c8 am: f2e19dd663
am: 5a4af6ab3a

Change-Id: Ifceb850f264e7cb11c5d7cedf84afd38cbf7f529

7 years agoMerge "DO NOT MERGE Isolated processes don't get precached system service binders...
Christopher Tate [Sat, 15 Oct 2016 01:02:02 +0000 (01:02 +0000)]
Merge "DO NOT MERGE Isolated processes don't get precached system service binders" into mnc-dev am: 7b685d4c39 am: ea75bae8c8 am: 3fa004554c am: 8169e87f25  -s ours
am: a026501af8

Change-Id: If07e3204c6667f5bd2a91a78bb82a02fba8a4bf7

7 years agoDO NOT MERGE Isolated processes don't get precached system service binders am: f4d23f...
Christopher Tate [Sat, 15 Oct 2016 01:01:09 +0000 (01:01 +0000)]
DO NOT MERGE Isolated processes don't get precached system service binders am: f4d23f30c9 am: f93e1f2671 am: 7044826aa8 am: 25c278dcbf  -s ours
am: db3446aa0f

Change-Id: I53cfc5839b1fd8a8bb8ed892ebba4165000c695e

7 years agoDO NOT MERGE Isolated processes don't get precached system service binders am: 190e66...
Christopher Tate [Sat, 15 Oct 2016 00:56:44 +0000 (00:56 +0000)]
DO NOT MERGE Isolated processes don't get precached system service binders am: 190e66685f am: eafeb8becf  -s ours am: 1d86a376c8
am: f2e19dd663

Change-Id: Iab8084402119c914bfe8debe806bbad946da11f1

7 years agoMerge "DO NOT MERGE Isolated processes don't get precached system service binders...
Christopher Tate [Sat, 15 Oct 2016 00:53:48 +0000 (00:53 +0000)]
Merge "DO NOT MERGE Isolated processes don't get precached system service binders" into mnc-dev am: 7b685d4c39 am: ea75bae8c8 am: 3fa004554c
am: 8169e87f25  -s ours

Change-Id: I79a7115d516c57a3ea3ed765c4899a750b2ed293

7 years agoDO NOT MERGE Isolated processes don't get precached system service binders am: f4d23f...
Christopher Tate [Sat, 15 Oct 2016 00:52:46 +0000 (00:52 +0000)]
DO NOT MERGE Isolated processes don't get precached system service binders am: f4d23f30c9 am: f93e1f2671 am: 7044826aa8
am: 25c278dcbf  -s ours

Change-Id: I660aeed03a70fa359374e86fd413dd216d5b061e

7 years agoDO NOT MERGE Isolated processes don't get precached system service binders am: 190e66...
Christopher Tate [Sat, 15 Oct 2016 00:48:41 +0000 (00:48 +0000)]
DO NOT MERGE Isolated processes don't get precached system service binders am: 190e66685f am: eafeb8becf  -s ours
am: 1d86a376c8

Change-Id: I8ac2637092e435c87d4695e2b7b89090be410841

7 years agoMerge "DO NOT MERGE Isolated processes don't get precached system service binders...
Christopher Tate [Sat, 15 Oct 2016 00:45:32 +0000 (00:45 +0000)]
Merge "DO NOT MERGE Isolated processes don't get precached system service binders" into mnc-dev am: 7b685d4c39 am: ea75bae8c8
am: 3fa004554c

Change-Id: Idfe3c9a1d6eec5ab06553fca928f7bfe19456bd5

7 years agoDO NOT MERGE Isolated processes don't get precached system service binders am: f4d23f...
Christopher Tate [Sat, 15 Oct 2016 00:44:43 +0000 (00:44 +0000)]
DO NOT MERGE Isolated processes don't get precached system service binders am: f4d23f30c9 am: f93e1f2671
am: 7044826aa8

Change-Id: Ia3129e0748d14e8250ac39d0f0e383318c9999bf

7 years agoDO NOT MERGE Isolated processes don't get precached system service binders am: 190e66685f
Christopher Tate [Sat, 15 Oct 2016 00:41:09 +0000 (00:41 +0000)]
DO NOT MERGE Isolated processes don't get precached system service binders am: 190e66685f
am: eafeb8becf  -s ours

Change-Id: Ia2dd7a763735ffc612a1043faba75a97e0726298

7 years agoMerge "DO NOT MERGE Isolated processes don't get precached system service binders...
Christopher Tate [Sat, 15 Oct 2016 00:38:19 +0000 (00:38 +0000)]
Merge "DO NOT MERGE Isolated processes don't get precached system service binders" into mnc-dev am: 7b685d4c39
am: ea75bae8c8

Change-Id: Ia8cd86b30ab467c139819469f2a4c75756c02b3b

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: f4d23f30c9
Christopher Tate [Sat, 15 Oct 2016 00:37:25 +0000 (00:37 +0000)]
DO NOT MERGE Isolated processes don't get precached system service binders am: f4d23f30c9
am: f93e1f2671

Change-Id: I202adaed715d782a393733fefc8a3712e06280e2

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 agoDO NOT MERGE Isolated processes don't get precached system service binders
Christopher Tate [Sat, 15 Oct 2016 00:33:36 +0000 (00:33 +0000)]
DO NOT MERGE Isolated processes don't get precached system service binders
am: 190e66685f

Change-Id: I0ed530e9909811e592f966a44f41400a0146c5b6

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...
Christopher Tate [Sat, 15 Oct 2016 00:29:49 +0000 (00:29 +0000)]
Merge "DO NOT MERGE Isolated processes don't get precached system service binders" into mnc-dev
am: 7b685d4c39

Change-Id: Iccd6270f455b045a26ff099e67cfc17ce05e170d

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

Change-Id: I0d22b5345bc4b3305bd2bcf68d485c0f06dfc15b

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

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 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 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