OSDN Git Service
Svetoslav [Fri, 6 Jun 2014 20:36:50 +0000 (20:36 +0000)]
Merge "Refactor printing"
Svetoslav [Thu, 15 May 2014 17:47:19 +0000 (10:47 -0700)]
Refactor printing
Change-Id: I19850154ef2798afff511e4490a268ce38e8cbae
Raph Levien [Fri, 6 Jun 2014 20:15:27 +0000 (20:15 +0000)]
Merge "Fix android.text.cts.TextUtilsTest#testRegionMatches"
Amith Yamasani [Fri, 6 Jun 2014 18:41:27 +0000 (11:41 -0700)]
Fix build breakage in BatteryController
Caused due to a checkin race.
Change-Id: Icb636e4b2258064572b494ee5fcdd30538691d81
Ian Rogers [Fri, 6 Jun 2014 19:57:29 +0000 (19:57 +0000)]
am
1f241f7e: (-s ours) am
74de10a0: (-s ours) am
d83ffe35: (-s ours) Merge "Add missing dependency in layoutlib build file [DO NOT MERGE]"
* commit '
1f241f7e16f7b363b0f0c3a9dc8e03e333e0852b':
Add missing dependency in layoutlib build file [DO NOT MERGE]
Ian Rogers [Fri, 6 Jun 2014 19:54:08 +0000 (19:54 +0000)]
am
74de10a0: (-s ours) am
d83ffe35: (-s ours) Merge "Add missing dependency in layoutlib build file [DO NOT MERGE]"
* commit '
74de10a0f232142b7a004ac6ca0fc94553796730':
Add missing dependency in layoutlib build file [DO NOT MERGE]
Ian Rogers [Fri, 6 Jun 2014 19:42:12 +0000 (19:42 +0000)]
am
d83ffe35: (-s ours) Merge "Add missing dependency in layoutlib build file [DO NOT MERGE]"
* commit '
d83ffe358db81abbde44ec38cd9121e67d25fbb3':
Add missing dependency in layoutlib build file [DO NOT MERGE]
Ian Rogers [Fri, 6 Jun 2014 19:34:12 +0000 (19:34 +0000)]
Merge "Add missing dependency in layoutlib build file [DO NOT MERGE]"
Dianne Hackborn [Fri, 6 Jun 2014 18:26:17 +0000 (18:26 +0000)]
am
87bc3c25: Merge "Improvements to low power mode." into lmp-preview-dev
* commit '
87bc3c258d8be516bc0fcedeb6eec34088582061':
Improvements to low power mode.
Selim Cinek [Fri, 6 Jun 2014 18:25:58 +0000 (18:25 +0000)]
am
b5de5c5e: Merge "When dragging down on the lockscreen, the lowest card could jump." into lmp-preview-dev
* commit '
b5de5c5eae5acf879314610a17c1c9950948782d':
When dragging down on the lockscreen, the lowest card could jump.
Dan Sandler [Fri, 6 Jun 2014 18:25:48 +0000 (18:25 +0000)]
am
e45ddb40: Merge "Always hide status bar icons when status bar is expanded" into lmp-preview-dev
* commit '
e45ddb4008b3c217b59bc4ded61aea3caf2341eb':
Always hide status bar icons when status bar is expanded
Dianne Hackborn [Fri, 6 Jun 2014 17:46:11 +0000 (17:46 +0000)]
Merge "Improvements to low power mode." into lmp-preview-dev
Yorke Lee [Fri, 6 Jun 2014 17:37:37 +0000 (17:37 +0000)]
Merge "API changes to Telephony per API review"
Dianne Hackborn [Wed, 4 Jun 2014 00:48:12 +0000 (17:48 -0700)]
Improvements to low power mode.
Add new public API for monitoring low power mode.
BatteryService now puts device in to low power mode when
battery level is low.
Window manager now watches low power mode to turn off
animations.
Modifying the animator scale now gets propagated to all
processes.
Change-Id: I8fa566994764ddd4e1977631e28381ab9409f8ee
Raph Levien [Fri, 6 Jun 2014 17:10:32 +0000 (17:10 +0000)]
Merge "Fix getFontMetrics problems"
Raph Levien [Fri, 6 Jun 2014 05:38:08 +0000 (22:38 -0700)]
Fix getFontMetrics problems
Fixes a number of individual problems. In Minikin builds, gets base font
from TypefaceImpl rather than using whatever random font was in the
paint. Respects elegant metrics in ascent and descent methods as well as
getFontMetrics. Sets fixed ascent and descent values to 1900, -500,
which matches the Roboto font.
Part of the fix for bug
15467288 "Inconsistent line heights on
Minikin builds"
Change-Id: I12915f4a62de28932469c7279241eecf7320c47b
Yorke Lee [Thu, 5 Jun 2014 15:41:47 +0000 (08:41 -0700)]
API changes to Telephony per API review
* Make context the first argument for isLocalEmergencyNumber and
isPotentialLocalEmergencyNumber
Bug:
15432083
Change-Id: I88b5ace925e3704bd032dc9694b0c2dd871b9cf9
Selim Cinek [Fri, 6 Jun 2014 16:15:34 +0000 (16:15 +0000)]
Merge "When dragging down on the lockscreen, the lowest card could jump." into lmp-preview-dev
Dan Sandler [Fri, 6 Jun 2014 16:15:33 +0000 (16:15 +0000)]
Merge "Always hide status bar icons when status bar is expanded" into lmp-preview-dev
Alexandra Gherghina [Fri, 6 Jun 2014 16:14:52 +0000 (16:14 +0000)]
Merge "Clean up deleted users in DevicePolicyManagerService"
Selim Cinek [Fri, 6 Jun 2014 16:06:04 +0000 (18:06 +0200)]
When dragging down on the lockscreen, the lowest card could jump.
Bug:
15203895
Change-Id: I1a0a5a236490f12dba93700685be049d723b5339
Jorim Jaggi [Fri, 6 Jun 2014 16:03:52 +0000 (18:03 +0200)]
Always hide status bar icons when status bar is expanded
Also improve the animation when expanding/collapsing the shade for
a jank-free alpha fade animation.
Bug:
15448443
Bug:
15407838
Change-Id: Ieb0ce6d5bb1e5c1fb60d433b6989c52ec6924e8c
George Mount [Fri, 6 Jun 2014 14:52:18 +0000 (14:52 +0000)]
am
2c9ce97c: Merge "API review: Constants to Gravity and Epicenter." into lmp-preview-dev
* commit '
2c9ce97c340393cb9fcb49d4163ab7d40f434186':
API review: Constants to Gravity and Epicenter.
John Reck [Fri, 6 Jun 2014 14:41:36 +0000 (14:41 +0000)]
Merge changes Ie0773f85,Ie5e75505
* changes:
Even FASTER damage calculations!
Have all the setters return changed
Florin Malita [Fri, 6 Jun 2014 14:04:32 +0000 (14:04 +0000)]
Merge "Implement SkCanvasGlue::clipRegion() using clipPath()."
George Mount [Fri, 6 Jun 2014 13:59:26 +0000 (13:59 +0000)]
Merge "API review: Constants to Gravity and Epicenter." into lmp-preview-dev
Kenny Guy [Fri, 6 Jun 2014 12:36:28 +0000 (12:36 +0000)]
am
b43f20d7: Merge "Badge notification from managed profiles." into lmp-preview-dev
* commit '
b43f20d772e5d3b1beafac648ba39c27c33bea01':
Badge notification from managed profiles.
Dongwon Kang [Fri, 6 Jun 2014 12:36:19 +0000 (12:36 +0000)]
am
1a4d3d02: Merge "TIF: Address the feedback from the API review - 2/3" into lmp-preview-dev
* commit '
1a4d3d02f32ba5e50f2b0da9058dedfbd6342ef9':
TIF: Address the feedback from the API review - 2/3
Dongwon Kang [Fri, 6 Jun 2014 12:36:13 +0000 (12:36 +0000)]
am
77b29f1f: Merge "TIF: Address the feedback from the API review - 1/3" into lmp-preview-dev
* commit '
77b29f1f7a0dfc7305ed49d2b68bb35b9cc11f4c':
TIF: Address the feedback from the API review - 1/3
Calin Juravle [Fri, 6 Jun 2014 12:31:24 +0000 (12:31 +0000)]
am
c88a5ac3: am
d1d46d9d: am
bbf849b1: Merge "Add missing profiler options."
* commit '
c88a5ac3ff0e3b3759c58279204bb8f6b8901669':
Add missing profiler options.
Calin Juravle [Fri, 6 Jun 2014 12:28:17 +0000 (12:28 +0000)]
am
d1d46d9d: am
bbf849b1: Merge "Add missing profiler options."
* commit '
d1d46d9d5564a27dae45c2f2a62e6769402b556c':
Add missing profiler options.
Calin Juravle [Fri, 6 Jun 2014 12:09:48 +0000 (12:09 +0000)]
am
bbf849b1: Merge "Add missing profiler options."
* commit '
bbf849b1c686c9e09c4d59574da70181a47ebb5d':
Add missing profiler options.
Calin Juravle [Fri, 6 Jun 2014 12:06:36 +0000 (12:06 +0000)]
Merge "Add missing profiler options."
Calin Juravle [Mon, 2 Jun 2014 15:45:13 +0000 (16:45 +0100)]
Add missing profiler options.
Bug:
12877748
Change-Id: I311b8fb7e15d512e65631bc2a52c443a271d3d3f
Nicolas Prevot [Fri, 6 Jun 2014 11:18:10 +0000 (11:18 +0000)]
Merge "Adding an extra and an action to notify the mdm to start the provisioning."
Nicolas Prevot [Tue, 27 May 2014 14:37:45 +0000 (15:37 +0100)]
Adding an extra and an action to notify the mdm to start the provisioning.
Adding EXTRA_PROVISIONING_EMAIL_ADDRESS and ACTION_START_PROVISIONING to DevicePolicyManager.
BUG:
15157562
Change-Id: Ic3ecc6b0a501e1df9a5f803a44347dd024a7a07c
Adam Skory [Fri, 6 Jun 2014 10:07:02 +0000 (10:07 +0000)]
Merge "Squash unreachable catch"
Kenny Guy [Fri, 6 Jun 2014 10:06:40 +0000 (10:06 +0000)]
Merge "Badge notification from managed profiles." into lmp-preview-dev
Dongwon Kang [Fri, 6 Jun 2014 06:59:16 +0000 (06:59 +0000)]
Merge "TIF: Address the feedback from the API review - 2/3" into lmp-preview-dev
Dongwon Kang [Fri, 6 Jun 2014 06:58:01 +0000 (06:58 +0000)]
Merge "TIF: Address the feedback from the API review - 1/3" into lmp-preview-dev
Yohei Yukawa [Fri, 6 Jun 2014 06:36:53 +0000 (15:36 +0900)]
Naming style fix for an internal constant
This CL does nothing except for adding MSG_ prefix to
an internal constant.
Change-Id: Ic41a8f1e31f5a6a84e6ff8fe9214e9cbc92e04d9
Ed Heyl [Fri, 6 Jun 2014 05:39:36 +0000 (22:39 -0700)]
fix build; undo automerger side affect
Change-Id: I30da1c85dd67f62f94ddd436a9268eeaa717d7fc
John Spurlock [Fri, 6 Jun 2014 03:42:48 +0000 (03:42 +0000)]
am
0fbd9364: Merge "VolumeZen: Only display active condition when entering." into lmp-preview-dev
* commit '
0fbd936409cdc233821f3d29b3ec12738febbf62':
VolumeZen: Only display active condition when entering.
John Spurlock [Fri, 6 Jun 2014 03:39:29 +0000 (03:39 +0000)]
Merge "VolumeZen: Only display active condition when entering." into lmp-preview-dev
John Spurlock [Fri, 6 Jun 2014 03:32:36 +0000 (03:32 +0000)]
am
01566c37: Merge "QuickSettings: Bluetooth updates." into lmp-preview-dev
* commit '
01566c37846b7ad9e4173f2ae50de78ca8c05495':
QuickSettings: Bluetooth updates.
John Spurlock [Fri, 6 Jun 2014 03:28:29 +0000 (03:28 +0000)]
Merge "QuickSettings: Bluetooth updates." into lmp-preview-dev
John Spurlock [Thu, 5 Jun 2014 13:55:37 +0000 (09:55 -0400)]
QuickSettings: Bluetooth updates.
- Use "Bluetooth" string when connecting.
- Use @hidden device alias (instead of name) for label.
- Use the same icon in the status bar.
Bug:
15186962
Change-Id: I25613bebf069c91e76d6933f2512b3f0a8020474
Aravind Akella [Fri, 6 Jun 2014 02:01:08 +0000 (02:01 +0000)]
am
ef601922: Merge "Hide Sensor.getRequiredPermission API." into lmp-preview-dev
* commit '
ef6019220a6f15fe1a4c1b1ed2d81d04ce0bcfe4':
Hide Sensor.getRequiredPermission API.
Aravind Akella [Fri, 6 Jun 2014 02:00:59 +0000 (02:00 +0000)]
am
7a9b037a: Merge "Remove getRequiredPermission from NDK." into lmp-preview-dev
* commit '
7a9b037ad14e09e59af9aea01192a3d697fe3f4e':
Remove getRequiredPermission from NDK.
Aravind Akella [Fri, 6 Jun 2014 01:57:25 +0000 (01:57 +0000)]
Merge "Hide Sensor.getRequiredPermission API." into lmp-preview-dev
Aravind Akella [Fri, 6 Jun 2014 01:56:56 +0000 (01:56 +0000)]
Merge "Remove getRequiredPermission from NDK." into lmp-preview-dev
Vinod Krishnan [Fri, 6 Jun 2014 01:54:10 +0000 (01:54 +0000)]
Merge "resolved conflicts for merge of
a3d5d3b8 to master"
Vinod Krishnan [Fri, 6 Jun 2014 01:51:47 +0000 (18:51 -0700)]
resolved conflicts for merge of
a3d5d3b8 to master
Change-Id: If0fe0cb541adb0eb74f13cf557ee264aa76c650c
Sol Boucher [Fri, 6 Jun 2014 01:51:25 +0000 (01:51 +0000)]
am
af9a77d6: camera2: Fix ordering issue between #onOpened and createCaptureSession
* commit '
af9a77d64912985a3fa9f91cd0e372316e790b9f':
camera2: Fix ordering issue between #onOpened and createCaptureSession
Sol Boucher [Thu, 5 Jun 2014 20:47:24 +0000 (13:47 -0700)]
camera2: Fix ordering issue between #onOpened and createCaptureSession
This resolves an issue where the CameraDevice.StateListener callbacks were
erroneously called before the CameraCaptureSession.StateListener ones,
preventing e.g. creating a capture session from the
CameraDevice.StateListener#onOpened() callback.
It also explicitly ignores CameraDevice.StateListener#onUnconfigured() calls
occurring before the first call to #close .
Bug:
15449190
Change-Id: Ic0094d53a65e42108201d7bb50734d17290fa9bf
Deepanshu Gupta [Mon, 31 Mar 2014 23:11:13 +0000 (16:11 -0700)]
Add missing dependency in layoutlib build file [DO NOT MERGE]
Add missing dependency on built_ext_data
Change-Id: I4e7cca7f6cbc7f5b7416ac9b85a9aec01e61ecd4
(cherry picked from commit
e345507ca4b7b83c6e0446788f4404eb697f945b)
John Spurlock [Fri, 6 Jun 2014 00:46:01 +0000 (20:46 -0400)]
VolumeZen: Only display active condition when entering.
Instead of always displaying the active condition, only
show it the first time (when turning zen on).
Bug:
15455271
Change-Id: I89e8e2c09fa0d06a5e4c3174f825dfe5a452f06e
Evan Charlton [Fri, 6 Jun 2014 00:50:35 +0000 (00:50 +0000)]
Merge "Fix the build breakage (update API & javadocs)"
Raph Levien [Fri, 6 Jun 2014 00:45:43 +0000 (00:45 +0000)]
am
455b351b: Merge "Make elegantTextHeight xml attribute public" into lmp-preview-dev
* commit '
455b351bba515c3a7e6139368c4110abbf1e4e89':
Make elegantTextHeight xml attribute public
Raph Levien [Fri, 6 Jun 2014 00:42:34 +0000 (00:42 +0000)]
Merge "Make elegantTextHeight xml attribute public" into lmp-preview-dev
Evan Charlton [Fri, 6 Jun 2014 00:31:11 +0000 (17:31 -0700)]
Fix the build breakage (update API & javadocs)
Update API and Javadocs to fix the build.
Change-Id: I108e4d824eabb68f8edd864bf67a16188672b01b
Prashant Malani [Fri, 6 Jun 2014 00:20:05 +0000 (00:20 +0000)]
am
59b82c3e: (-s ours) am
42db3761: Merge "DO NOT MERGE Change display state modification during dozing" into klp-modular-dev
* commit '
59b82c3eae2cd329461b7ad64bd8abee4898a90e':
DO NOT MERGE Change display state modification during dozing
Vinod Krishnan [Fri, 6 Jun 2014 00:16:40 +0000 (00:16 +0000)]
am
90e96db0: Merge "Adding a way to stub Vpn ConfirmDialog" into klp-modular-dev
* commit '
90e96db0b5a200f528f1ca6a66d5aeaa5c915ca2':
Adding a way to stub Vpn ConfirmDialog
Prashant Malani [Fri, 6 Jun 2014 00:16:35 +0000 (00:16 +0000)]
am
42db3761: Merge "DO NOT MERGE Change display state modification during dozing" into klp-modular-dev
* commit '
42db3761c9ee3df11a367cbc907f2ba433251634':
DO NOT MERGE Change display state modification during dozing
Jae Seo [Tue, 3 Jun 2014 22:34:50 +0000 (15:34 -0700)]
TIF: Address the feedback from the API review - 2/3
This change addresses the following comments from the council:
- Change the TvView API to be tune(String inputId, Uri channelUri) and
reset()
- @hide TvInputSession class, including createSession() and
SessionCallback
- Define a listener interface specific to TvView, allowing you to hide
the session details and keep the API simpler. Add
setTvInputListener().
Bug:
15345342
Change-Id: I931662841b41d862ebc4a700ccb245889a5f87a5
Yin-Chia Yeh [Thu, 5 Jun 2014 23:37:07 +0000 (23:37 +0000)]
am
6d892689: Merge "Camera2: Do not hide TonemapCurve construtor" into lmp-preview-dev
* commit '
6d892689f569871e2e711669c0262a7d25b3e091':
Camera2: Do not hide TonemapCurve construtor
Yin-Chia Yeh [Thu, 5 Jun 2014 23:33:37 +0000 (23:33 +0000)]
Merge "Camera2: Do not hide TonemapCurve construtor" into lmp-preview-dev
Zhijun He [Thu, 5 Jun 2014 23:21:03 +0000 (23:21 +0000)]
am
b67beb8e: Merge "Camera2: Hide input stream related key and enum" into lmp-preview-dev
* commit '
b67beb8e8b9115c1ba796a57f1bb59822e6a1ce1':
Camera2: Hide input stream related key and enum
Alan Viverette [Thu, 5 Jun 2014 23:16:17 +0000 (23:16 +0000)]
am
6f2ed69f: (-s ours) Merge "DO NOT MERGE Change preference category text color for quantum" into lmp-preview-dev
* commit '
6f2ed69f25dad726baabe67b98c9107fd9bcaa46':
DO NOT MERGE Change preference category text color for quantum
Evan Charlton [Thu, 5 Jun 2014 23:15:58 +0000 (23:15 +0000)]
am
266a63ad: Merge "Expose post-dial APIs" into lmp-preview-dev
* commit '
266a63ad7731d7ebaf4c426b3d226e70c6afd2af':
Expose post-dial APIs
Zhijun He [Thu, 5 Jun 2014 23:15:17 +0000 (23:15 +0000)]
Merge "Camera2: Hide input stream related key and enum" into lmp-preview-dev
Alan Viverette [Thu, 5 Jun 2014 23:09:57 +0000 (23:09 +0000)]
Merge "DO NOT MERGE Change preference category text color for quantum" into lmp-preview-dev
Vinod Krishnan [Thu, 5 Jun 2014 23:03:48 +0000 (23:03 +0000)]
Merge "Adding a way to stub Vpn ConfirmDialog" into klp-modular-dev
Prashant Malani [Thu, 5 Jun 2014 23:03:19 +0000 (23:03 +0000)]
Merge "DO NOT MERGE Change display state modification during dozing" into klp-modular-dev
Prashant Malani [Thu, 5 Jun 2014 23:02:41 +0000 (23:02 +0000)]
Merge "Change display state modification during dozing"
Yorke Lee [Thu, 5 Jun 2014 22:47:11 +0000 (15:47 -0700)]
Revert "API changes to Telephony per API review"
The original change was submitted into lmp-preview-dev and should
not have been auto-merged to master.
This reverts commit
80327f7a31b19213ec48e1ab66e6bdc8e76cb0fe.
Change-Id: I9ff8a868ffa3135583c52ef97b15311107716899
Evan Charlton [Thu, 5 Jun 2014 22:52:07 +0000 (22:52 +0000)]
Merge "Expose post-dial APIs" into lmp-preview-dev
Deepanshu Gupta [Thu, 5 Jun 2014 22:43:22 +0000 (22:43 +0000)]
am
ee001119: Merge "LayoutLib: Add assertions for typeface." into lmp-preview-dev
* commit '
ee0011198ff150f972c8afbc5dff695bce2af1f1':
LayoutLib: Add assertions for typeface.
Deepanshu Gupta [Thu, 5 Jun 2014 22:43:16 +0000 (22:43 +0000)]
am
242dded6: Merge "LayoutLib: Font variants" into lmp-preview-dev
* commit '
242dded6e8b7e5851ad7b80a0c05e4883d2a9f42':
LayoutLib: Font variants
Deepanshu Gupta [Thu, 5 Jun 2014 22:43:11 +0000 (22:43 +0000)]
am
9a9d96bf: Merge "LayoutLib: Add capability to simulate old versions" into lmp-preview-dev
* commit '
9a9d96bf044bd75e0d75e16a6002dc20e5399866':
LayoutLib: Add capability to simulate old versions
ztenghui [Thu, 5 Jun 2014 22:39:11 +0000 (22:39 +0000)]
am
42decb1b: Merge "API Review: move the CreateRevealAnimator to ViewAnimationUtils" into lmp-preview-dev
* commit '
42decb1bfe354923205a7cdf856f395f9070b64f':
API Review: move the CreateRevealAnimator to ViewAnimationUtils
Deepanshu Gupta [Thu, 5 Jun 2014 22:38:00 +0000 (22:38 +0000)]
Merge "LayoutLib: Add assertions for typeface." into lmp-preview-dev
Deepanshu Gupta [Thu, 5 Jun 2014 22:37:08 +0000 (22:37 +0000)]
Merge "LayoutLib: Font variants" into lmp-preview-dev
Deepanshu Gupta [Thu, 5 Jun 2014 22:36:57 +0000 (22:36 +0000)]
Merge "LayoutLib: Add capability to simulate old versions" into lmp-preview-dev
ztenghui [Thu, 5 Jun 2014 22:32:41 +0000 (22:32 +0000)]
Merge "API Review: move the CreateRevealAnimator to ViewAnimationUtils" into lmp-preview-dev
Raph Levien [Thu, 5 Jun 2014 22:26:59 +0000 (15:26 -0700)]
Make elegantTextHeight xml attribute public
The elegantTextHeight attribute of TextView was made public through
Java code, but the corresponding attribute wasn't public. This patch
makes it so.
This is a fix for bug
15428791 "elegantTextHeight is hidden (not in
android.R.attr)"
Change-Id: I7011f10ae58fd2e212da9cbaca4a484f011d8fed
Vinod Krishnan [Thu, 5 Jun 2014 18:50:34 +0000 (11:50 -0700)]
Adding a way to stub Vpn ConfirmDialog
- This is needed to pass CTS tests on the wear devices
- Related CL: http://ar/479486
Bug:
15087985
Change-Id: I56673ff6085618a03ec61031e3af0f6631cb3425
Prashant Malani [Wed, 28 May 2014 02:23:59 +0000 (19:23 -0700)]
DO NOT MERGE Change display state modification during dozing
Check that the BrightnessRamp animation has completed before updating
the display state to STATE_DOZING.
Bug:
13472578
Change-Id: Ib9751f7a987463e4df98571e846d829ec8e73b5e
Signed-off-by: Prashant Malani <pmalani@google.com>
Aravind Akella [Thu, 22 May 2014 20:33:52 +0000 (13:33 -0700)]
Remove getRequiredPermission from NDK.
Bug:
15089664
Change-Id: Ieb1e97e44ef335e6087ba9164058fe3535e9998a
(cherry picked from commit
8bcdd9b7a5c99e9a5bf1e45f7924b67037898e75)
Aravind Akella [Wed, 21 May 2014 21:14:45 +0000 (14:14 -0700)]
Hide Sensor.getRequiredPermission API.
Bug:
15089664
Change-Id: Ia0f4e64a563ca409849cf53721b4836abbb0be68
(cherry picked from commit
e7213150abbe33c71dbdc3295a1fa1feaafb069d)
Ji-Hwan Lee [Thu, 5 Jun 2014 22:23:11 +0000 (22:23 +0000)]
am
b3412adf: Merge "TvContract: Add channel logo and program thumbnail" into lmp-preview-dev
* commit '
b3412adf92b9d932b600acf44c4463cf06387a8e':
TvContract: Add channel logo and program thumbnail
Yorke Lee [Thu, 5 Jun 2014 22:23:03 +0000 (22:23 +0000)]
am
87d1dbc5: Merge "API changes to Telephony per API review" into lmp-preview-dev
* commit '
87d1dbc52e473227b2b4bc0d95ca48cfb3363adc':
API changes to Telephony per API review
Alan Viverette [Thu, 5 Jun 2014 22:22:57 +0000 (22:22 +0000)]
am
7553d48d: Merge "Fix default stroke width and NPE for line with no stroke width" into lmp-preview-dev
* commit '
7553d48d28683b5b21e964d837a3f3c0f66af9ad':
Fix default stroke width and NPE for line with no stroke width
Chris Craik [Thu, 5 Jun 2014 22:22:51 +0000 (22:22 +0000)]
am
8632b85b: Merge "Fix issues around GL on incorrect thread" into lmp-preview-dev
* commit '
8632b85b3ceca1b64ca37843ffd87bc10f4ae72f':
Fix issues around GL on incorrect thread
Matthew Williams [Thu, 5 Jun 2014 22:22:50 +0000 (22:22 +0000)]
am
426209c6: Merge "Include forgotten file to fix build." into lmp-preview-dev
* commit '
426209c658d97338396b0dd042d64ed084d94396':
Include forgotten file to fix build.
Ji-Hwan Lee [Thu, 5 Jun 2014 22:12:05 +0000 (22:12 +0000)]
Merge "TvContract: Add channel logo and program thumbnail" into lmp-preview-dev
Yorke Lee [Thu, 5 Jun 2014 22:02:22 +0000 (22:02 +0000)]
Merge "API changes to Telephony per API review" into lmp-preview-dev
Alan Viverette [Thu, 5 Jun 2014 21:57:31 +0000 (21:57 +0000)]
Merge "Fix default stroke width and NPE for line with no stroke width" into lmp-preview-dev
Chris Craik [Thu, 5 Jun 2014 21:53:48 +0000 (21:53 +0000)]
Merge "Fix issues around GL on incorrect thread" into lmp-preview-dev
Kristian Monsen [Thu, 5 Jun 2014 21:50:59 +0000 (21:50 +0000)]
Merge "Remove unused function from the WebView statics"
OSDN Git Service
