OSDN Git Service
TreeHugger Robot [Sat, 17 Feb 2018 01:43:26 +0000 (01:43 +0000)]
Merge "Grant default permissions to TextClassifier app."
Hans Boehm [Sat, 17 Feb 2018 01:28:49 +0000 (01:28 +0000)]
Merge "Avoid BinderProxy duplicate native registration"
TreeHugger Robot [Sat, 17 Feb 2018 01:16:22 +0000 (01:16 +0000)]
Merge "Owners file for StatsCompanionService"
TreeHugger Robot [Sat, 17 Feb 2018 01:10:07 +0000 (01:10 +0000)]
Merge "Implement requestLocationCb"
TreeHugger Robot [Sat, 17 Feb 2018 01:03:35 +0000 (01:03 +0000)]
Merge "Safeguard against NPE race condition."
Etan Cohen [Sat, 17 Feb 2018 00:17:55 +0000 (00:17 +0000)]
Merge "[RTT] LCI/LCR to System API - unparsed"
Android Build Merger (Role) [Fri, 16 Feb 2018 23:40:05 +0000 (23:40 +0000)]
Merge "Merge "MSIM support for hidden IMS capability and registration query APIs." am:
b8d25ed3a4 am:
5cb9aa55e8 -s ours am:
f63b3dcb89 -s ours"
Brad Ebinger [Fri, 16 Feb 2018 23:38:44 +0000 (23:38 +0000)]
Merge "MSIM support for hidden IMS capability and registration query APIs." am:
b8d25ed3a4 am:
5cb9aa55e8 -s ours
am:
f63b3dcb89 -s ours
Change-Id: Ib994c656b6cc4f702ccf2d1149b806f51501fb84
Sudheer Shanka [Fri, 16 Feb 2018 23:37:45 +0000 (23:37 +0000)]
Merge "Read per-uid cpu times less often."
Brad Ebinger [Fri, 16 Feb 2018 23:21:41 +0000 (23:21 +0000)]
Merge "MSIM support for hidden IMS capability and registration query APIs." am:
b8d25ed3a4
am:
5cb9aa55e8 -s ours
Change-Id: I9da5571baf210378fd2f0bbd59f3cca04be849af
TreeHugger Robot [Fri, 16 Feb 2018 23:21:27 +0000 (23:21 +0000)]
Merge "Tweak QQS <-> QS animation."
Brad Ebinger [Fri, 16 Feb 2018 23:09:39 +0000 (23:09 +0000)]
Merge "MSIM support for hidden IMS capability and registration query APIs."
am:
b8d25ed3a4
Change-Id: I1636e80c2f09e8949ba44f7225aed16448ed5692
TreeHugger Robot [Fri, 16 Feb 2018 22:53:42 +0000 (22:53 +0000)]
Merge "Always remeasure weighted children, even if there's no excess space"
Adrian Roos [Fri, 16 Feb 2018 22:47:11 +0000 (22:47 +0000)]
Merge "OverlayManager: Add categories"
Todd Kennedy [Fri, 16 Feb 2018 22:29:59 +0000 (22:29 +0000)]
Merge "Remove non-existent command from usage text"
TreeHugger Robot [Fri, 16 Feb 2018 22:29:02 +0000 (22:29 +0000)]
Merge "Remove Support Library from frameworks/base pathmap.mk"
TreeHugger Robot [Fri, 16 Feb 2018 22:24:35 +0000 (22:24 +0000)]
Merge "Recommend ICU replacements, no clone, no Impl."
TreeHugger Robot [Fri, 16 Feb 2018 22:21:41 +0000 (22:21 +0000)]
Merge "Align Theme, Theme.Holo, and Theme.Holo.Light with Material attrs"
Aurimas Liutikas [Fri, 16 Feb 2018 22:19:42 +0000 (22:19 +0000)]
Merge "Remove uses of private Platform class in truth library."
Jeff Sharkey [Fri, 16 Feb 2018 22:13:01 +0000 (22:13 +0000)]
Merge "Better handling of NTP-based clocks."
Jeff Sharkey [Thu, 15 Feb 2018 05:29:11 +0000 (22:29 -0700)]
Better handling of NTP-based clocks.
Now that we have a nice Clock abstraction, we can use it to represent
a clock backed by an NTP fix. (This makes testing logic much easier
to write.)
We now rely completely on NetworkTimeUpdateService to keep our NTP
fix up to date, instead of trying to refresh in the middle of
critical paths which could trigger random ANRs.
Add internal FallbackClock to make it easier to handle missing NTP
fixes. Add internal SimpleClock to let implementers focus on single
millis() method.
Test: bit FrameworksNetTests:com.android.server.net.NetworkStatsServiceTest
Test: bit FrameworksServicesTests:com.android.server.NetworkPolicyManagerServiceTest
Bug:
69714690,
72320957
Change-Id: Ic32cdcbe093d08b73b0e4b23d6910b23ea8e1968
Exempt-From-Owner-Approval: approved in previous PS
Makoto Onuki [Fri, 16 Feb 2018 22:04:26 +0000 (22:04 +0000)]
Merge "Change sync manager init timing back to PHASE_ACTIVITY_MANAGER_READY"
Jorim Jaggi [Fri, 16 Feb 2018 22:03:37 +0000 (22:03 +0000)]
Merge "Cutout: Fix issues with PopupWindows"
Rajeev Kumar [Fri, 16 Feb 2018 21:52:22 +0000 (21:52 +0000)]
Merge "Implement atom puller for ProcessMemoryState."
Evan Rosky [Fri, 16 Feb 2018 21:51:24 +0000 (21:51 +0000)]
Merge "[DO NOT MERGE] Fix some mouse + list-item selection/scrolling issues" am:
8b764a0dab -s ours am:
d418ecfc66 -s ours
am:
0df5ca72d6 -s ours
Change-Id: Id7a9148a0b1d9298a51388a4d505e18860384915
TreeHugger Robot [Fri, 16 Feb 2018 21:43:37 +0000 (21:43 +0000)]
Merge "Custom SmartReplyView layout"
Evan Rosky [Fri, 16 Feb 2018 21:36:56 +0000 (21:36 +0000)]
Merge "[DO NOT MERGE] Fix some mouse + list-item selection/scrolling issues" am:
8b764a0dab -s ours
am:
d418ecfc66 -s ours
Change-Id: I7d45de823c87f346b25ad0194dc538b560d67bad
Evan Rosky [Fri, 16 Feb 2018 21:25:26 +0000 (21:25 +0000)]
Merge "[DO NOT MERGE] Fix some mouse + list-item selection/scrolling issues"
am:
8b764a0dab -s ours
Change-Id: Iffb3e3c70d9d135f15f66f3bf7968dfef9f1d4f5
Vladislav Kaznacheev [Fri, 16 Feb 2018 20:54:48 +0000 (20:54 +0000)]
Merge "[DO NOT MERGE] Fix context menu position for RTL" am:
80ae7124f5 -s ours am:
e715e2162e -s ours
am:
9059147479 -s ours
Change-Id: I3e3914690d8e8c42d247712a041954f6eafe2387
Benedict Wong [Fri, 16 Feb 2018 20:51:37 +0000 (20:51 +0000)]
Merge "Correct bug in IpSecTransformTest" am:
999d1fc172 am:
c9f558d46d
am:
12cb5aae57
Change-Id: Ic29f13053365f3de8d01f9c38f8460d92748a41d
Vladislav Kaznacheev [Fri, 16 Feb 2018 20:46:04 +0000 (20:46 +0000)]
Merge "[DO NOT MERGE] Fix context menu position for RTL" am:
80ae7124f5 -s ours
am:
e715e2162e -s ours
Change-Id: I6edeac6d72d6f3471bbfc8f39fec282567441e82
Jeff Sharkey [Fri, 16 Feb 2018 20:45:41 +0000 (20:45 +0000)]
Merge "Add RequiresFeature annotation."
Jeff Sharkey [Fri, 16 Feb 2018 17:14:57 +0000 (10:14 -0700)]
Add RequiresFeature annotation.
Certain APIs require that a device have a specific feature to operate
correctly, so start annotating them.
Test: builds, boots
Bug:
72284763
Change-Id: Ie2f30284bdfdb6acc4067f434eba3b5433837606
Exempt-From-Owner-Approval: simple annotations
Benedict Wong [Fri, 16 Feb 2018 20:43:12 +0000 (20:43 +0000)]
Merge "Correct bug in IpSecTransformTest" am:
999d1fc172
am:
c9f558d46d
Change-Id: I990729e8592e70898867fe72a3d628fd7f9fdaf0
Brad Ebinger [Fri, 16 Feb 2018 20:35:45 +0000 (20:35 +0000)]
Merge "MSIM support for hidden IMS capability and registration query APIs."
Vladislav Kaznacheev [Fri, 16 Feb 2018 20:31:06 +0000 (20:31 +0000)]
Merge "[DO NOT MERGE] Fix context menu position for RTL"
am:
80ae7124f5 -s ours
Change-Id: If52d9831857624890785c31689d69dd6c0f28e09
Jeff Sharkey [Fri, 16 Feb 2018 20:29:29 +0000 (13:29 -0700)]
Recommend ICU replacements, no clone, no Impl.
When ICU has a better replacement class, recommend that APIs use
that instead.
Yell if someone implements clone(), and point them towards a copy
constructor instead.
Yell if someone exposes "Impl" classes.
Test: manual
Bug:
73392214,
71906588,
62627348
Change-Id: I75dcba2c4ab7ca426057eefb0335c935c3ced79a
Benedict Wong [Fri, 16 Feb 2018 20:28:18 +0000 (20:28 +0000)]
Merge "Correct bug in IpSecTransformTest"
am:
999d1fc172
Change-Id: If99a991052a821f43b8238a47d0d2c7e00362bc3
Amin Shaikh [Fri, 16 Feb 2018 20:08:16 +0000 (15:08 -0500)]
Tweak QQS <-> QS animation.
Add a start delay so users do not see the footer divider intersecting
the animating second row of QS tiles.
Test: visual
Change-Id: Iea0a0ec7a3a4e849dc774bc5c1bd452ff56c3854
TreeHugger Robot [Fri, 16 Feb 2018 20:06:54 +0000 (20:06 +0000)]
Merge "Fix javadoc in SettingsSliceContract"
Treehugger Robot [Fri, 16 Feb 2018 20:02:26 +0000 (20:02 +0000)]
Merge "[DO NOT MERGE] Fix some mouse + list-item selection/scrolling issues"
Treehugger Robot [Fri, 16 Feb 2018 19:54:26 +0000 (19:54 +0000)]
Merge "[DO NOT MERGE] Fix context menu position for RTL"
Alan Viverette [Fri, 2 Feb 2018 21:33:37 +0000 (16:33 -0500)]
Always remeasure weighted children, even if there's no excess space
Bug:
72630654
Test: atest LinearLayoutTest
Change-Id: Ie9637950aef32f080b8284a63003eb61c0a88841
Abodunrinwa Toki [Tue, 13 Feb 2018 17:47:48 +0000 (17:47 +0000)]
Grant default permissions to TextClassifier app.
Bug:
72746494
Test: bit FrameworksCoreTests:android.view.textclassifier.TextClassificationManagerTest
Change-Id: I92ab3a7d3041c7db521c49c0090e6813691341bd
TreeHugger Robot [Fri, 16 Feb 2018 19:06:53 +0000 (19:06 +0000)]
Merge "Allowing Typeface as a param in TypefaceSpan."
TreeHugger Robot [Fri, 16 Feb 2018 18:46:50 +0000 (18:46 +0000)]
Merge "Adding maximum input size checks"
Jeff Sharkey [Fri, 16 Feb 2018 18:46:29 +0000 (18:46 +0000)]
Merge "Grant DCS storage access; better OBB errors."
Jerry Zhang [Fri, 16 Feb 2018 18:44:23 +0000 (18:44 +0000)]
Merge "Remove urb request size maximum for P api"
Adrian Roos [Fri, 16 Feb 2018 18:35:27 +0000 (19:35 +0100)]
Cutout: Fix issues with PopupWindows
Fixes a problem where popup windows were treated as fullscreen to avoid
the cutout, messing up the positioning relative to their parent. Fixed
by treating popups that lay out within the frame of their parent as already
avoiding the cutout.
Change-Id: Ia7365c7836c28ea956b6236a005e426b634df8ca
Fixes:
72965959
Test: Open Gmail, compose new message, autocomplete dialog is properly aligned
Test: Select text, selection handles are properly aligned
Test: Select text, copy/past popup is properly aligned
Benedict Wong [Fri, 16 Feb 2018 18:32:05 +0000 (18:32 +0000)]
Merge "Correct bug in IpSecTransformTest"
Yu-Han Yang [Fri, 9 Feb 2018 21:58:17 +0000 (13:58 -0800)]
Implement requestLocationCb
- For network location, send a single request and inject it.
- For fused location, send a 'streaming' request for 30 sec duration and
1 Hz updates.
Bug:
72405645
Test: locally added a cts in LocationManager to trigger the flow.
Change-Id: I8ce73976e4e62836037bf3563f239719c9a89305
TreeHugger Robot [Fri, 16 Feb 2018 18:24:18 +0000 (18:24 +0000)]
Merge "Optimization: don't call AFM.notifyValueChanged() when value didn't change."
Hans Boehm [Fri, 16 Feb 2018 00:12:51 +0000 (16:12 -0800)]
Avoid BinderProxy duplicate native registration
In case of an OOME, we would recycle the nativeData we just allocated,
even if the BinderProxy.getInstance() call got far enough to register
the allocation for automatic freeing. This could cause a duplicate
deallocation.
This changes the code to be much more careful about handling native
deallocation correctly in the exception case.
Bug:
72707270
Test: Build and boot master.
Change-Id: I2cffdd1d59af95f089714893e819c2d02302a6d4
Etan Cohen [Tue, 13 Feb 2018 16:38:47 +0000 (08:38 -0800)]
[RTT] LCI/LCR to System API - unparsed
Move LCI/LCR to a System API - unparsed:
- Punting parsing for future release
- Not widely available in APs for testing
- Usability/deployment unclear
Bug:
71643239
Bug:
73088768
Test: unit tests & sanity integration tests
Change-Id: Idd3bded55e887abbad6c51b00b31e75c859ba579
Andreas Gampe [Fri, 16 Feb 2018 18:12:41 +0000 (18:12 +0000)]
Merge "Framework: Disable [MissingOverride] for platformprotos" am:
4eaa22f24e am:
1c14209950
am:
63f4ea33e7 -s ours
Change-Id: I6672dabe7fdda3599b385b4cf34e7a649123479c
Oscar Shu [Fri, 16 Feb 2018 18:09:01 +0000 (18:09 +0000)]
Merge "Deprecate supplicant related stuff in WifiManager"
Oscar Shu [Fri, 16 Feb 2018 18:08:29 +0000 (18:08 +0000)]
Merge "Deprecate WpsInfo"
Bruno Martins [Fri, 16 Feb 2018 18:06:03 +0000 (18:06 +0000)]
Merge "BluetoothTile: Avoid NPE during boot up phase" am:
977bcea1f0 am:
a1f96ff00e
am:
db10020d15
Change-Id: Id635f3ca0463165a149ffffc9169676a486a4442
Andreas Gampe [Fri, 16 Feb 2018 17:57:14 +0000 (17:57 +0000)]
Merge "Framework: Disable [MissingOverride] for platformprotos" am:
4eaa22f24e
am:
1c14209950
Change-Id: Ib664802f2a8673ba0d1504a9b93f764ae993b044
Makoto Onuki [Fri, 16 Feb 2018 17:52:50 +0000 (09:52 -0800)]
Change sync manager init timing back to PHASE_ACTIVITY_MANAGER_READY
Bug:
73350582
Test: boot
Test: atest CtsSyncManagerTest
Change-Id: Ib4948af473d9381882d30c03a63a306b73204704
Bruno Martins [Fri, 16 Feb 2018 17:50:09 +0000 (17:50 +0000)]
Merge "BluetoothTile: Avoid NPE during boot up phase" am:
977bcea1f0
am:
a1f96ff00e
Change-Id: Id61a5fe96c065377916a630da4842bd675c8ab14
Andreas Gampe [Fri, 16 Feb 2018 17:46:08 +0000 (17:46 +0000)]
Merge "Framework: Disable [MissingOverride] for platformprotos"
am:
4eaa22f24e
Change-Id: I376b8bea0e1c57a6f7e78970bc919d05d1ed372d
Alan Viverette [Fri, 16 Feb 2018 17:22:47 +0000 (12:22 -0500)]
Align Theme, Theme.Holo, and Theme.Holo.Light with Material attrs
Due to themes always overlaying, legacy and Holo themes must explicitly
define Material attributes as @null (e.g. unset).
Deprecates Holo themes. Nobody should be using these anymore.
Bug:
72203192
Test: CtsThemeHostTests & manual verification of bug
Change-Id: I65e9ceddc7aec54b1b8df0231f0755cbd5529886
Bruno Martins [Fri, 16 Feb 2018 17:41:30 +0000 (17:41 +0000)]
Merge "BluetoothTile: Avoid NPE during boot up phase"
am:
977bcea1f0
Change-Id: I692e2c21f92d0e8eff5c9114e012cd90e84f31e9
TreeHugger Robot [Fri, 16 Feb 2018 17:31:42 +0000 (17:31 +0000)]
Merge "Resupport long compare"
Petr Cermak [Mon, 29 Jan 2018 10:36:07 +0000 (10:36 +0000)]
Custom SmartReplyView layout
Implement SmartReplyView#onMeasure and SmartReplyView#onLayout according
to the redlines in go/p-notifications:
* Smart reply buttons can have at most 2 lines of text.
* Squeeze buttons to 2 lines of text when necessary to fit more
buttons.
* Don't show buttons which have more than 2 lines of text or don't fit
within the notification width.
* Update button background and text color.
Screenshot: https://screenshot.googleplex.com/cSM6Ve7qjb3.png
Bug:
67765414
Test: atest SmartReplyViewTest
Change-Id: Ia161c7f5669e7aef1b8c3480a8836784f0bde055
TreeHugger Robot [Fri, 16 Feb 2018 17:30:43 +0000 (17:30 +0000)]
Merge "Adds locks to ConfigManager in statsd."
David Brazdil [Fri, 16 Feb 2018 17:29:01 +0000 (17:29 +0000)]
Merge "Add more hidden API into light greylist"
Matthew Fritze [Fri, 16 Feb 2018 17:28:34 +0000 (09:28 -0800)]
Fix javadoc in SettingsSliceContract
Test: none. only comment change.
Change-Id: I6d4419798a7a59ad9a9be7b4e41bfc50c3cf158e
Fixes:
73392084
TreeHugger Robot [Fri, 16 Feb 2018 17:28:32 +0000 (17:28 +0000)]
Merge "Remove a statsd duration anomaly sanity check."
TreeHugger Robot [Fri, 16 Feb 2018 17:06:17 +0000 (17:06 +0000)]
Merge "MediaPlayer2: initial code for playlist support"
Aurimas Liutikas [Fri, 16 Feb 2018 16:19:04 +0000 (16:19 +0000)]
Remove uses of private Platform class in truth library.
Change-Id: I8d53ddb04fe5bccf70ef9db7bac8b37e34234ff6
Test: None
Mathew Inwood [Fri, 16 Feb 2018 16:48:28 +0000 (16:48 +0000)]
Merge "Hidden API blacklisting killswitch." am:
46656fa28e am:
84259cea59
am:
a8bb7189ba -s ours
Change-Id: Ia1137d759b1618e2ec1acbd07e4458f0a625b124
Mathew Inwood [Fri, 16 Feb 2018 16:39:59 +0000 (16:39 +0000)]
Merge "Hidden API blacklisting killswitch." am:
46656fa28e
am:
84259cea59
Change-Id: Ia0bcbfb2cdc84a6a8a82f82ecda82f46ba46dab1
Mathew Inwood [Fri, 16 Feb 2018 16:31:26 +0000 (16:31 +0000)]
Merge "Hidden API blacklisting killswitch."
am:
46656fa28e
Change-Id: I1276e1eb5b2d4438ebc6f071ed28f1f322a8bc6e
Felipe Leme [Wed, 14 Feb 2018 23:08:58 +0000 (15:08 -0800)]
Optimization: don't call AFM.notifyValueChanged() when value didn't change.
Test: manual verification
Test: atest CtsAutoFillServiceTestCases
Bug:
73078981
Change-Id: Ib0a40d4ab0e6f4a1300622fa4d7a2f6026aa98a1
Kevin Neas [Fri, 16 Feb 2018 16:06:19 +0000 (16:06 +0000)]
Merge "AppLaunch tests for Wear"
Treehugger Robot [Fri, 16 Feb 2018 16:05:19 +0000 (16:05 +0000)]
Merge "Framework: Disable [MissingOverride] for platformprotos"
Felipe Leme [Fri, 16 Feb 2018 16:04:17 +0000 (16:04 +0000)]
Merge "Revert an incorrectly changed API call"
Evan Laird [Fri, 16 Feb 2018 15:37:22 +0000 (15:37 +0000)]
Merge "Revert "[QS] Add header tooltip for long press""
Evan Laird [Fri, 16 Feb 2018 15:25:53 +0000 (15:25 +0000)]
Revert "[QS] Add header tooltip for long press"
This reverts commit
22caf078e493ff49e021a8f5af80ac10d4926feb.
Reason for revert: Quick settings is no longer expanding properly. Reverting this fixes it
Change-Id: I63b82e948316726067214b088016661785982e3a
Treehugger Robot [Fri, 16 Feb 2018 15:20:23 +0000 (15:20 +0000)]
Merge "BluetoothTile: Avoid NPE during boot up phase"
Tim Volodine [Fri, 16 Feb 2018 15:00:27 +0000 (15:00 +0000)]
Merge "WebView Tracing API: address comments from the API council."
Daniel Sandler [Fri, 16 Feb 2018 15:00:21 +0000 (15:00 +0000)]
Merge "Clean up DozeService plugin listeners."
Beverly Tai [Fri, 16 Feb 2018 14:23:37 +0000 (14:23 +0000)]
Merge "Animate charging text on lockscreen"
Chavi Weingarten [Fri, 16 Feb 2018 14:05:06 +0000 (14:05 +0000)]
Merge "Revert "Use destroy in transaction for animation""
Wale Ogunwale [Fri, 16 Feb 2018 12:56:48 +0000 (12:56 +0000)]
Merge "Move home stack forward while entering split-screen in some cases"
Treehugger Robot [Fri, 16 Feb 2018 11:50:20 +0000 (11:50 +0000)]
Merge "Hidden API blacklisting killswitch."
Nicolas Geoffray [Fri, 16 Feb 2018 11:28:13 +0000 (11:28 +0000)]
Merge "Small cleanup in AppLaunch."
Leon Scroggins [Fri, 16 Feb 2018 11:25:23 +0000 (11:25 +0000)]
Merge "Reland "Call ImageDecoder directly in ResourcesImpl""
Mathew Inwood [Thu, 15 Feb 2018 10:28:06 +0000 (10:28 +0000)]
Hidden API blacklisting killswitch.
Just support "*" for now, meaning disable all API blacklisting for all
apps.
Test: Manually verified by:
- installing test app that accesses hidden API
- manually blacklist the API
- $ adb shell settings put global hidden_api_blacklist_exemptions \\*
This is a cherry pick of change I9a41a104742c9aaaf3a753e7b0f3a1106e37d4d3
from internal master.
Merged-In: I9a41a104742c9aaaf3a753e7b0f3a1106e37d4d3
Change-Id: Ibb2a1d054c1b099fc6093e37f24b2ed421a2313c
Peter Visontay [Fri, 16 Feb 2018 09:54:09 +0000 (09:54 +0000)]
Merge "Remove the OP_REQUEST_DELETE_PACKAGES op from the list of runtime permissions."
Svet Ganov [Fri, 16 Feb 2018 08:11:39 +0000 (00:11 -0800)]
Revert an incorrectly changed API call
Test: cts-tradefed run cts -m CtsAutoFillServiceTestCases
bug:
73508533
Change-Id: Ie103814294230177ffddf957ce8c5adcb84686c3
TreeHugger Robot [Fri, 16 Feb 2018 08:09:29 +0000 (08:09 +0000)]
Merge "ContextWrapper should check before calling wrapped instance for autofill compat"
Hugo Benichi [Fri, 16 Feb 2018 07:58:57 +0000 (07:58 +0000)]
Merge "Add missing'}' in javadoc of public API method" am:
f50d9fbdc1 am:
054bed5968
am:
7b2ffeff58
Change-Id: I2cfda60077c57d151fb8599845cd202bbc4e625d
Hugo Benichi [Fri, 16 Feb 2018 07:50:57 +0000 (07:50 +0000)]
Merge "Add missing'}' in javadoc of public API method" am:
f50d9fbdc1
am:
054bed5968
Change-Id: I51ad1f6b8d42f4c791c07d41297f02d3e798ccd9
Hugo Benichi [Fri, 16 Feb 2018 07:43:08 +0000 (07:43 +0000)]
Merge "Add missing'}' in javadoc of public API method"
am:
f50d9fbdc1
Change-Id: I3afcd9a3752ff6d158d68ca3ce19272151c1908c
TreeHugger Robot [Fri, 16 Feb 2018 07:05:15 +0000 (07:05 +0000)]
Merge "Camera: update API for external camera"
TreeHugger Robot [Fri, 16 Feb 2018 06:39:21 +0000 (06:39 +0000)]
Merge "Framework: Disable [MissingOverride] for platformprotos"
Calin Juravle [Fri, 16 Feb 2018 06:01:34 +0000 (06:01 +0000)]
Merge "Pass the compilation reason to dexopt" am:
b0817b238a am:
68024999b7
am:
e31b7c4d24
Change-Id: Id200b36eaaca791932da03a41383e5ee055319cb