OSDN Git Service
Daniel Sheng [Fri, 21 Apr 2017 19:36:40 +0000 (19:36 +0000)]
Merge "Added Trust Agent category from SUW suggestions"
Philip P. Moltmann [Fri, 21 Apr 2017 19:17:14 +0000 (19:17 +0000)]
Merge "Fine tune the Autofill Save UI" into oc-dev am:
ede054a73e
am:
ff104b7792
Change-Id: Ife574a028ce662eadb58f8eab2b9f3601acd9bd0
Wale Ogunwale [Fri, 21 Apr 2017 19:10:39 +0000 (19:10 +0000)]
Merge "Switched wtf in DimLayerController to warning instead" into oc-dev am:
d0c3b9c685
am:
4a724cb5f3
Change-Id: Iaf861b4ec0738daa05002a9060dada4612a6a5d9
Jesse Hall [Fri, 21 Apr 2017 19:05:28 +0000 (19:05 +0000)]
Merge "Match AHardwareBuffer format name change" into oc-dev am:
489edb395b
am:
89d3d2ae01
Change-Id: I5f3da6a9e9b3bbe621e433947754d79a0e6a3691
Philip P. Moltmann [Fri, 21 Apr 2017 19:01:28 +0000 (19:01 +0000)]
Merge "Fine tune the Autofill Save UI" into oc-dev
am:
ede054a73e
Change-Id: I0f23b28dbb8da1a3182411223bb3edde09fb56d8
Wale Ogunwale [Fri, 21 Apr 2017 18:58:59 +0000 (18:58 +0000)]
Merge "Switched wtf in DimLayerController to warning instead" into oc-dev
am:
d0c3b9c685
Change-Id: Ia75c5e478341cac25a7783ee058edd89bd05e7e8
Jordan Liu [Fri, 21 Apr 2017 18:55:36 +0000 (18:55 +0000)]
Merge "Merge "Use SubscriptionId instead of SubId" am:
946410eef5 am:
9cad054e02 am:
fb0acf3355" into oc-dev-plus-aosp
am:
f36c63052c
Change-Id: I13877d19f9b4e87b906c3262044daca173eb63fb
TreeHugger Robot [Fri, 21 Apr 2017 18:53:15 +0000 (18:53 +0000)]
Merge "Fine tune the Autofill Save UI" into oc-dev
Joe Fernandez [Fri, 21 Apr 2017 18:53:15 +0000 (18:53 +0000)]
Merge "docs: Update Imageview JavaDoc comments" into oc-dev am:
62a24e9493
am:
2bc550372e
Change-Id: Ie95de6fe8e14339d8f077437172353fed511f3f7
Jesse Hall [Fri, 21 Apr 2017 18:52:54 +0000 (18:52 +0000)]
Merge "Match AHardwareBuffer format name change" into oc-dev
am:
489edb395b
Change-Id: Ib258e8485a3bcafef4ec65f4b28caaaeb081189e
Wale Ogunwale [Fri, 21 Apr 2017 18:52:41 +0000 (18:52 +0000)]
Merge "Switched wtf in DimLayerController to warning instead" into oc-dev
Joe Fernandez [Fri, 21 Apr 2017 18:51:18 +0000 (18:51 +0000)]
Merge "docs: Update TextView JavaDoc comments" into oc-dev am:
28973b3817
am:
474b5af269
Change-Id: I1671edae68637162bf23fe108b78d6490f0d3300
Android Build Merger (Role) [Fri, 21 Apr 2017 18:47:06 +0000 (18:47 +0000)]
Merge "Merge "Use SubscriptionId instead of SubId" am:
946410eef5 am:
9cad054e02 am:
fb0acf3355" into oc-dev-plus-aosp
Jordan Liu [Fri, 21 Apr 2017 18:45:36 +0000 (18:45 +0000)]
Merge "Use SubscriptionId instead of SubId" am:
946410eef5 am:
9cad054e02
am:
fb0acf3355
Change-Id: I81365ed8a767f4571a62da0ff0ba170badcce462
Joe Fernandez [Fri, 21 Apr 2017 18:44:57 +0000 (18:44 +0000)]
Merge "docs: Update Imageview JavaDoc comments" into oc-dev
am:
62a24e9493
Change-Id: I480054acc8be3934bb7ad25cc932da380fab5d02
Joe Fernandez [Fri, 21 Apr 2017 18:42:54 +0000 (18:42 +0000)]
Merge "docs: Update TextView JavaDoc comments" into oc-dev
am:
28973b3817
Change-Id: I9bdc0c10f3046f0d6f1c1abe0a8977379121d6b4
TreeHugger Robot [Fri, 21 Apr 2017 18:38:19 +0000 (18:38 +0000)]
Merge "Match AHardwareBuffer format name change" into oc-dev
TreeHugger Robot [Fri, 21 Apr 2017 18:36:46 +0000 (18:36 +0000)]
Merge "docs: Update Imageview JavaDoc comments" into oc-dev
TreeHugger Robot [Fri, 21 Apr 2017 18:34:08 +0000 (18:34 +0000)]
Merge "docs: Update TextView JavaDoc comments" into oc-dev
Jordan Liu [Fri, 21 Apr 2017 18:30:29 +0000 (18:30 +0000)]
Merge "Use SubscriptionId instead of SubId" am:
946410eef5
am:
9cad054e02
Change-Id: Ib57abfadda3521667ce788e37e77496300feef4e
Jordan Liu [Fri, 21 Apr 2017 18:23:00 +0000 (18:23 +0000)]
Merge "Use SubscriptionId instead of SubId"
am:
946410eef5
Change-Id: Ib6f689a69ff19b24cc5ac128e77254c0d7624161
Kang Li [Fri, 21 Apr 2017 18:20:11 +0000 (18:20 +0000)]
Merge "Removes colon characters from the doc of EXTRA_CONTENT_ANNOTATIONS." into oc-dev am:
8b4f17be85
am:
9d6cb20646
Change-Id: I40b3e211111afb40789c13bed940310a96f45fcf
Seigo Nonaka [Fri, 21 Apr 2017 18:18:19 +0000 (18:18 +0000)]
Merge "Cache the Typeface based on the FontRequest." into oc-dev am:
5b96e55d90
am:
a121eabf99
Change-Id: Ib4e0860910b498cc8effb5b62b5642d0d9bbd39d
Jordan Liu [Fri, 21 Apr 2017 18:17:51 +0000 (18:17 +0000)]
Merge "Use SubscriptionId instead of SubId"
Kang Li [Fri, 21 Apr 2017 18:11:33 +0000 (18:11 +0000)]
Merge "Removes colon characters from the doc of EXTRA_CONTENT_ANNOTATIONS." into oc-dev
am:
8b4f17be85
Change-Id: I56bb063e1e6ff9003f852a47db355519dec22a69
Seigo Nonaka [Fri, 21 Apr 2017 18:09:44 +0000 (18:09 +0000)]
Merge "Cache the Typeface based on the FontRequest." into oc-dev
am:
5b96e55d90
Change-Id: Ic185a25c605e7345afa214d3b50fd859135f7b9b
TreeHugger Robot [Fri, 21 Apr 2017 18:03:06 +0000 (18:03 +0000)]
Merge "Removes colon characters from the doc of EXTRA_CONTENT_ANNOTATIONS." into oc-dev
TreeHugger Robot [Fri, 21 Apr 2017 18:00:51 +0000 (18:00 +0000)]
Merge "Cache the Typeface based on the FontRequest." into oc-dev
Rebecca Silberstein [Fri, 21 Apr 2017 17:53:23 +0000 (17:53 +0000)]
Merge "WifiManager: add new methods to start softap" into oc-dev am:
435f1dc7a7 -s ours
am:
a1a3869582 -s ours
Change-Id: If5401c51e5adc428fbcc7a0cc8beeeb23da61d3f
Felipe Leme [Fri, 21 Apr 2017 17:43:45 +0000 (17:43 +0000)]
Merge "Removed deprecated SaveInfo methods." into oc-dev am:
fc533da920
am:
184347912d
Change-Id: Ib49f2d736db07ab73d8d5ff2ca6efa7dc08fa3e2
Rebecca Silberstein [Fri, 21 Apr 2017 17:41:31 +0000 (17:41 +0000)]
Merge "WifiManager: add new methods to start softap" into oc-dev
am:
435f1dc7a7 -s ours
Change-Id: Iec3175ed83e50f31154868b634899373b5c53519
Felipe Leme [Fri, 21 Apr 2017 17:35:12 +0000 (17:35 +0000)]
Merge "Removed deprecated SaveInfo methods." into oc-dev
am:
fc533da920
Change-Id: I930aaeaec76f0fa8ffe01bd7ca7bbad0cca977f8
Rebecca Silberstein [Fri, 21 Apr 2017 17:33:41 +0000 (17:33 +0000)]
Merge "WifiManager: add new methods to start softap" into oc-dev
Julia Reynolds [Fri, 21 Apr 2017 17:31:21 +0000 (17:31 +0000)]
Merge "Remove long standing debug code" into oc-dev am:
f74a736add
am:
ce822b2fb7
Change-Id: Ib9702a224dae742c6a6f1418567e537d8e857e84
TreeHugger Robot [Fri, 21 Apr 2017 17:28:09 +0000 (17:28 +0000)]
Merge "Removed deprecated SaveInfo methods." into oc-dev
Julia Reynolds [Fri, 21 Apr 2017 17:26:16 +0000 (17:26 +0000)]
Merge "Remove long standing debug code" into oc-dev
am:
f74a736add
Change-Id: Iaf5aba1c4146da1352fea149171832cff88b3978
TreeHugger Robot [Fri, 21 Apr 2017 17:17:17 +0000 (17:17 +0000)]
Merge "Remove long standing debug code" into oc-dev
Daniel Sheng [Fri, 21 Apr 2017 17:17:16 +0000 (10:17 -0700)]
Added Trust Agent category from SUW suggestions
Bug:
36513986
Test: make RunSettingsRoboTests
Change-Id: Ie3b501349fa6ec8542e75231c039d9071d04285c
Tony Mak [Fri, 21 Apr 2017 17:00:29 +0000 (17:00 +0000)]
Merge "Send ACTION_POWER_SAVE_MODE_CHANGED to all user" into oc-dev am:
035aaddbb3
am:
4fdb1d16fb
Change-Id: I4cb19b60c6ae909d1802cb0f192cc650cc1fa4da
Julia Reynolds [Fri, 21 Apr 2017 16:58:31 +0000 (16:58 +0000)]
Merge "Move companion device check to the handler" into oc-dev am:
077b1ea14d
am:
f1c14812e9
Change-Id: Id74e51010a49907d814e2b32c2138329ecd03ac0
Meng Wang [Fri, 21 Apr 2017 16:52:01 +0000 (16:52 +0000)]
Merge "Merge "Fix error message: getAllowedCarriers" am:
112d039dfb am:
03f4a0f034 am:
96b140489c" into oc-dev-plus-aosp
am:
1b92e2d849
Change-Id: I6df83c2fed6f9f91451c37a49244baff78c03347
Tony Mak [Fri, 21 Apr 2017 16:51:19 +0000 (16:51 +0000)]
Merge "Send ACTION_POWER_SAVE_MODE_CHANGED to all user" into oc-dev
am:
035aaddbb3
Change-Id: I5b9b7b1a779b46aca047eb589d58a34c456fdf2c
Jason Monk [Fri, 21 Apr 2017 16:49:51 +0000 (16:49 +0000)]
Merge "QS + DND interaction again" into oc-dev am:
d84ff64f96
am:
6b4ee852cf
Change-Id: I953b719e40c99c74768f2cf9bca660d966c6636f
Julia Reynolds [Fri, 21 Apr 2017 16:48:17 +0000 (16:48 +0000)]
Merge "Move companion device check to the handler" into oc-dev
am:
077b1ea14d
Change-Id: Ibb3dcd97136da1d5d131457c2a2596ccc09c1485
Anthony Chen [Fri, 21 Apr 2017 16:46:03 +0000 (16:46 +0000)]
Merge "Modifications to allow notification header to be customized."
Android Build Merger (Role) [Fri, 21 Apr 2017 16:45:45 +0000 (16:45 +0000)]
Merge "Merge "Fix error message: getAllowedCarriers" am:
112d039dfb am:
03f4a0f034 am:
96b140489c" into oc-dev-plus-aosp
Meng Wang [Fri, 21 Apr 2017 16:45:00 +0000 (16:45 +0000)]
Merge "Fix error message: getAllowedCarriers" am:
112d039dfb am:
03f4a0f034
am:
96b140489c
Change-Id: Icec36f8895e4ffb081989973abf563fddbf2f2fd
TreeHugger Robot [Fri, 21 Apr 2017 16:44:44 +0000 (16:44 +0000)]
Merge "Send ACTION_POWER_SAVE_MODE_CHANGED to all user" into oc-dev
TreeHugger Robot [Fri, 21 Apr 2017 16:43:20 +0000 (16:43 +0000)]
Merge "Move companion device check to the handler" into oc-dev
Jason Monk [Fri, 21 Apr 2017 16:43:13 +0000 (16:43 +0000)]
Merge "QS + DND interaction again" into oc-dev
am:
d84ff64f96
Change-Id: I0fa2650cb925001c0212b6d528184577f54451a2
Pavel Grafov [Fri, 21 Apr 2017 16:43:08 +0000 (16:43 +0000)]
Merge "Fix javadoc for some user restrictions." into oc-dev am:
9c8bb68071
am:
9488302c42
Change-Id: Id6bd824580abfec1b5c7d6ae7c555eecfed39989
Meng Wang [Fri, 21 Apr 2017 16:38:13 +0000 (16:38 +0000)]
Merge "Fix error message: getAllowedCarriers" am:
112d039dfb
am:
03f4a0f034
Change-Id: If62a8b9d7b4a2c36d20cdb00877563a5586a5f72
Bill Yi [Fri, 21 Apr 2017 16:37:10 +0000 (16:37 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev am:
21b5f4063e -s ours
am:
5cdb654cbd -s ours
Change-Id: Idab936d6add40ecb0a7940dde61af850c1a1a8ef
Pavel Grafov [Fri, 21 Apr 2017 16:35:09 +0000 (16:35 +0000)]
Merge "Fix javadoc for some user restrictions." into oc-dev
am:
9c8bb68071
Change-Id: I0c77cdfdf173f50701ce2cf52a3004b6297ff369
Wale Ogunwale [Fri, 21 Apr 2017 16:35:08 +0000 (16:35 +0000)]
Merge "Ignore request to add starting window if already visible" into oc-dev am:
9daf0e62a4
am:
4dfb7e3db2
Change-Id: I96444e4ebb10084b9109eb340f714bd3e9d80bcc
TreeHugger Robot [Fri, 21 Apr 2017 16:35:02 +0000 (16:35 +0000)]
Merge "QS + DND interaction again" into oc-dev
Meng Wang [Fri, 21 Apr 2017 16:32:12 +0000 (16:32 +0000)]
Merge "Fix error message: getAllowedCarriers"
am:
112d039dfb
Change-Id: Ic04b23b87f56261c2c55f1e0a284109bf353c8d0
Bill Yi [Fri, 21 Apr 2017 16:29:37 +0000 (16:29 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
am:
21b5f4063e -s ours
Change-Id: Ibe6ea76c93c5203c4d528731aeb8bf691deaea3b
TreeHugger Robot [Fri, 21 Apr 2017 16:28:45 +0000 (16:28 +0000)]
Merge "Fix javadoc for some user restrictions." into oc-dev
Wale Ogunwale [Fri, 21 Apr 2017 16:27:11 +0000 (16:27 +0000)]
Merge "Ignore request to add starting window if already visible" into oc-dev
am:
9daf0e62a4
Change-Id: Ic610537f8573292e4bead83482b13c545c5b92b8
Bill Yi [Fri, 21 Apr 2017 16:26:39 +0000 (16:26 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev am:
03150c4a29 -s ours
am:
97c12deabb -s ours
Change-Id: I4478c1637241a89f668dfba9747fc6c488026141
TreeHugger Robot [Fri, 21 Apr 2017 16:25:21 +0000 (16:25 +0000)]
Merge "Import translations. DO NOT MERGE"
Treehugger Robot [Fri, 21 Apr 2017 16:23:33 +0000 (16:23 +0000)]
Merge "Fix error message: getAllowedCarriers"
TreeHugger Robot [Fri, 21 Apr 2017 16:23:17 +0000 (16:23 +0000)]
Merge "Add remaining tests for Trampoline."
TreeHugger Robot [Fri, 21 Apr 2017 16:21:57 +0000 (16:21 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
Bill Yi [Fri, 21 Apr 2017 16:19:29 +0000 (16:19 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
am:
03150c4a29 -s ours
Change-Id: Ie39e3beb8efda623bb1ee2669a59c5f0b3c77ac0
TreeHugger Robot [Fri, 21 Apr 2017 16:16:43 +0000 (16:16 +0000)]
Merge "Ignore request to add starting window if already visible" into oc-dev
TreeHugger Robot [Fri, 21 Apr 2017 16:15:52 +0000 (16:15 +0000)]
Merge "Import translations. DO NOT MERGE"
TreeHugger Robot [Fri, 21 Apr 2017 16:15:33 +0000 (16:15 +0000)]
Merge "Import translations. DO NOT MERGE"
TreeHugger Robot [Fri, 21 Apr 2017 16:12:22 +0000 (16:12 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
Seigo Nonaka [Wed, 19 Apr 2017 19:16:39 +0000 (12:16 -0700)]
Cache the Typeface based on the FontRequest.
Bug:
37471729
Test: FontsContractE2ETest
Change-Id: Ifb1bd2b50077471404f5f1dffc01e7697d7042e6
TreeHugger Robot [Fri, 21 Apr 2017 16:08:22 +0000 (16:08 +0000)]
Merge "Import translations. DO NOT MERGE"
Hyunyoung Song [Fri, 21 Apr 2017 15:38:14 +0000 (15:38 +0000)]
Merge "Support fraction type for inset* for InsetDrawable. b/
36024318" into oc-dev am:
ab7a2879eb
am:
a457ce7ce8
Change-Id: I9dab39e4f2ee254925bcf2bdba592e8769016cc9
Aurimas Liutikas [Fri, 21 Apr 2017 15:33:18 +0000 (15:33 +0000)]
Merge "Fix/suppress error-prone warnings in framework's fragment." into oc-dev am:
d3892caf95
am:
f3523dcaab
Change-Id: I562b77c500a7a73e9549124f0f2882893a2b58d0
Hyunyoung Song [Fri, 21 Apr 2017 15:30:40 +0000 (15:30 +0000)]
Merge "Support fraction type for inset* for InsetDrawable. b/
36024318" into oc-dev
am:
ab7a2879eb
Change-Id: I8c474b66527b7d718d61e1039840c5fa5d5f21e8
Aurimas Liutikas [Fri, 21 Apr 2017 15:26:24 +0000 (15:26 +0000)]
Merge "Fix/suppress error-prone warnings in framework's fragment." into oc-dev
am:
d3892caf95
Change-Id: I3cdc3a4949ce9636dc3d4b5e5075ccf30f4b29d5
Felipe Leme [Fri, 21 Apr 2017 15:08:39 +0000 (08:08 -0700)]
Removed deprecated SaveInfo methods.
Test: CtsAutoFillServiceTestCases pass
Bug:
37563972
Bug:
33197203
Change-Id: Ie90fa78c31f033c47e7b2f018355ae87759c622b
Kang Li [Wed, 19 Apr 2017 18:56:05 +0000 (11:56 -0700)]
Removes colon characters from the doc of EXTRA_CONTENT_ANNOTATIONS.
bug:
37496130
Test: skipped test, because the change is only in javadoc.
Change-Id: I899d55da59260eabfcea0549a1c6a338bcda2c81
TreeHugger Robot [Fri, 21 Apr 2017 15:14:18 +0000 (15:14 +0000)]
Merge "Support fraction type for inset* for InsetDrawable. b/
36024318" into oc-dev
Aurimas Liutikas [Fri, 21 Apr 2017 15:14:04 +0000 (15:14 +0000)]
Merge "Fix/suppress error-prone warnings in framework's fragment." into oc-dev
Artem Iglikov [Fri, 21 Apr 2017 12:23:16 +0000 (13:23 +0100)]
Add remaining tests for Trampoline.
Also a bit of refactoring on TrampolineTestable and enable it for
presubmits.
Bug:
37520021
Test: manually ran the unit test.
Change-Id: I20214b70d3eb35017d50983bd8bebef93b66e839
TreeHugger Robot [Fri, 21 Apr 2017 14:09:20 +0000 (14:09 +0000)]
Merge "Create helper script to parse systrace files"
Pavel Grafov [Fri, 21 Apr 2017 13:48:21 +0000 (14:48 +0100)]
Fix javadoc for some user restrictions.
DISALLOW_UNMUTE_MICROPHONE and DISALLOW_ADJUST_VOLUME can
be set by POs on secondary users as well. But they have no
effect on managed profiles.
(In the bug I erroneously mentionted DISALLOW_UNMUTE_DEVICE
which is @hidden instead of *_MICROPHONE).
Bug:
36024135
Test: IntelliJ quickdoc popup renders correctly.
Change-Id: I7a0e77ac993846cdc3a4ddf4d457e1282872107f
Julia Reynolds [Thu, 20 Apr 2017 15:31:30 +0000 (11:31 -0400)]
Move companion device check to the handler
To return faster to the app that's creating channels, since
companion device manager has to read from xml.
Fixes:
37534164
Test: runtest systemui-notification, manual with an app with strict
mode on.
Change-Id: I78909ba3ca6b33302fb78756b49c9014de5aeb12
Julia Reynolds [Wed, 19 Apr 2017 17:50:12 +0000 (13:50 -0400)]
Remove long standing debug code
Because it stops real errors from bubbling up to the calling app.
Test: make, post notifications
Change-Id: I0e59c61b0a60302a5fd023b7ad909e84b97e5df5
Fixes:
37494547
Michal Karpinski [Fri, 21 Apr 2017 12:40:00 +0000 (12:40 +0000)]
Merge "[DO NOT MERGE] Fix potential NPE in Trampoline.requestBackup()." into oc-dev am:
0db9724b6c
am:
c7bc48f1d6 -s ours
Change-Id: Ieda4ac533daeedd487fd57a713407887ffcc67a5
Michal Karpinski [Fri, 21 Apr 2017 12:30:02 +0000 (12:30 +0000)]
Merge "[DO NOT MERGE] Fix potential NPE in Trampoline.requestBackup()." into oc-dev
am:
0db9724b6c
Change-Id: I36ac24d6ffa41eda4d7cacee931410ee933744d3
Michal Karpinski [Fri, 21 Apr 2017 12:20:58 +0000 (12:20 +0000)]
Merge "[DO NOT MERGE] Fix potential NPE in Trampoline.requestBackup()." into oc-dev
Bill Yi [Fri, 21 Apr 2017 11:25:45 +0000 (04:25 -0700)]
Import translations. DO NOT MERGE
Change-Id: Icb35140eaa33c3a84fa47712917356d44f64a3f2
Auto-generated-cl: translation import
Bill Yi [Fri, 21 Apr 2017 11:21:57 +0000 (04:21 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ida4d17127df81670a51a4bf933d8df61729fa2c4
Auto-generated-cl: translation import
Abodunrinwa Toki [Fri, 21 Apr 2017 11:15:52 +0000 (11:15 +0000)]
Merge "SmartSelection ConfigUpdater: Ignore version numbers" into oc-dev am:
924d482a44
am:
cfb9a94c2b
Change-Id: Iaaf07f7eaa4f36611285862f2d00caee3b27131f
Abodunrinwa Toki [Fri, 21 Apr 2017 11:09:50 +0000 (11:09 +0000)]
Merge "SmartSelection ConfigUpdater: Ignore version numbers" into oc-dev
am:
924d482a44
Change-Id: I6de3b90235b311a1a1c6344a8517e2ae9e643b5b
TreeHugger Robot [Fri, 21 Apr 2017 11:05:45 +0000 (11:05 +0000)]
Merge "SmartSelection ConfigUpdater: Ignore version numbers" into oc-dev
Bill Yi [Fri, 21 Apr 2017 11:01:47 +0000 (04:01 -0700)]
Import translations. DO NOT MERGE
Change-Id: I533828fecb18d6b3e77b2e65d2d1d1afa1fe8af0
Auto-generated-cl: translation import
TreeHugger Robot [Fri, 21 Apr 2017 10:48:04 +0000 (10:48 +0000)]
Merge changes I30dfeadc,I186cf812
* changes:
Fix and enable test for Trampoline.requestBackup().
Fix potential NPE in Trampoline.requestBackup().
Artem Iglikov [Fri, 21 Apr 2017 08:50:56 +0000 (09:50 +0100)]
[DO NOT MERGE] Fix potential NPE in Trampoline.requestBackup().
Before it was returning null in case the service was not initialized,
but as the method signature has int as the return type, this was boxed
and unboxed which would cause NPE.
Now it will return BackupManager.ERROR_BACKUP_NOT_ALLOWED instead.
This doesn't include fix for the test, because it's going to be
cherry-picked into oc-dev, which doesn't have the tests.
Test: manually ran unit tests
Bug:
37535747
Change-Id: I186cf812a4ec67be943b5c4334c82e9af5320b7a
Jerome Gaillard [Fri, 21 Apr 2017 10:23:07 +0000 (10:23 +0000)]
Merge "Update golden image following Change If9039398"
Clara Bayarri [Fri, 21 Apr 2017 09:55:49 +0000 (09:55 +0000)]
Merge "Update Typeface callback docs about error codes" into oc-dev am:
337be5a12f
am:
5d2334fb7c
Change-Id: Ib85820fd4e743102b6697ecb9ac92b5e45aa9c05
Clara Bayarri [Fri, 21 Apr 2017 09:50:13 +0000 (09:50 +0000)]
Merge "Update Typeface callback docs about error codes" into oc-dev
am:
337be5a12f
Change-Id: I145d3a197d6d1457b95afdbf08bb1caef6cf8446
TreeHugger Robot [Fri, 21 Apr 2017 09:44:48 +0000 (09:44 +0000)]
Merge "Update Typeface callback docs about error codes" into oc-dev
OSDN Git Service
