OSDN Git Service
Yuling Liang [Fri, 25 Apr 2014 17:38:00 +0000 (17:38 +0000)]
am
69a9d925: am
eea94f06: Merge "Revert "Followon fix for
14276128 Clipping at bottom of TextView"" into klp-modular-dev
* commit '
69a9d92502428a4cf6eb6b5bf6577d9e525796a2':
Revert "Followon fix for
14276128 Clipping at bottom of TextView"
Yuling Liang [Fri, 25 Apr 2014 17:35:52 +0000 (17:35 +0000)]
am
eea94f06: Merge "Revert "Followon fix for
14276128 Clipping at bottom of TextView"" into klp-modular-dev
* commit '
eea94f060a917a5c6195a81d8825551a430a8d69':
Revert "Followon fix for
14276128 Clipping at bottom of TextView"
Yuling Liang [Fri, 25 Apr 2014 17:32:28 +0000 (17:32 +0000)]
Merge "Revert "Followon fix for
14276128 Clipping at bottom of TextView"" into klp-modular-dev
Yuling Liang [Fri, 25 Apr 2014 17:32:08 +0000 (17:32 +0000)]
Revert "Followon fix for
14276128 Clipping at bottom of TextView"
This reverts commit
a10e19845ce76c0e4dd38018c84b83c9255dc9fe.
Change-Id: I6d40451c9eb6285859e16d251b55947663a3553a
Alexandra Gherghina [Fri, 25 Apr 2014 17:12:43 +0000 (17:12 +0000)]
Merge "Temporarily switch off returning only enabled profiles to support dogfooding"
Alexandra Gherghina [Fri, 25 Apr 2014 15:42:11 +0000 (16:42 +0100)]
Temporarily switch off returning only enabled profiles to support dogfooding
Bug:
14132551
Change-Id: I3679c8fc248a799c816e5b80641b1fca6b7af061
Dianne Hackborn [Fri, 25 Apr 2014 17:02:18 +0000 (17:02 +0000)]
Merge "Initial implementation of new voice interaction API."
Allen Hair [Fri, 25 Apr 2014 16:59:20 +0000 (16:59 +0000)]
Merge "Fix nativeGetAnimationFrameStats to use the correct times."
Allen Hair [Fri, 25 Apr 2014 16:57:34 +0000 (16:57 +0000)]
Merge "Fixed shell manifest to use correct permission."
Selim Gurun [Fri, 25 Apr 2014 16:44:10 +0000 (16:44 +0000)]
Merge "Clarify a use case."
Yuling Liang [Fri, 25 Apr 2014 16:41:07 +0000 (16:41 +0000)]
am
60f8349b: am
243e551a: Merge "Followon fix for
14276128 Clipping at bottom of TextView" into klp-modular-dev
* commit '
60f8349b9819130e81e28106a35bf3362d337045':
Followon fix for
14276128 Clipping at bottom of TextView
Selim Gurun [Fri, 25 Apr 2014 16:39:31 +0000 (09:39 -0700)]
Clarify a use case.
Clarify a use case regarding clearing client certificates.
Change-Id: Ifdfa00022bb21b26e6f62dbad585faef4f8fc3c7
Yuling Liang [Fri, 25 Apr 2014 16:34:15 +0000 (16:34 +0000)]
am
243e551a: Merge "Followon fix for
14276128 Clipping at bottom of TextView" into klp-modular-dev
* commit '
243e551ac380f86639eee3e95a482d8e17836670':
Followon fix for
14276128 Clipping at bottom of TextView
Yuling Liang [Fri, 25 Apr 2014 16:30:12 +0000 (16:30 +0000)]
Merge "Followon fix for
14276128 Clipping at bottom of TextView" into klp-modular-dev
Chris Craik [Fri, 25 Apr 2014 16:22:26 +0000 (16:22 +0000)]
Merge "Refactor Drawable outline production, flesh out Outline methods"
Marco Nelissen [Fri, 25 Apr 2014 14:55:11 +0000 (14:55 +0000)]
am
ebd6a2d2: am
eded9e3b: am
adcf38c9: Merge "Release DrmManagerClient resources"
* commit '
ebd6a2d2710ebf7196a399d6d5a2f0745844310b':
Release DrmManagerClient resources
Marco Nelissen [Fri, 25 Apr 2014 14:52:18 +0000 (14:52 +0000)]
am
eded9e3b: am
adcf38c9: Merge "Release DrmManagerClient resources"
* commit '
eded9e3b7f6f30526365461a25624b841611af28':
Release DrmManagerClient resources
Marco Nelissen [Fri, 25 Apr 2014 14:46:35 +0000 (14:46 +0000)]
am
adcf38c9: Merge "Release DrmManagerClient resources"
* commit '
adcf38c9936fa372309d413cec03a1413e797c7a':
Release DrmManagerClient resources
Marco Nelissen [Fri, 25 Apr 2014 14:42:02 +0000 (14:42 +0000)]
Merge "Release DrmManagerClient resources"
Jungshik Jang [Fri, 25 Apr 2014 14:09:17 +0000 (14:09 +0000)]
Merge "Implement skeleton of new HDMI Control Service."
Jorim Jaggi [Fri, 25 Apr 2014 13:13:11 +0000 (13:13 +0000)]
Merge "Attempt to fix blank lockscreen."
Jorim Jaggi [Fri, 25 Apr 2014 12:56:15 +0000 (14:56 +0200)]
Attempt to fix blank lockscreen.
Bug:
14280857
Change-Id: Icf458040b1a0b0a412981acf7b522d04c046a5f8
Colin Cross [Fri, 25 Apr 2014 05:45:05 +0000 (22:45 -0700)]
fix build
When commit
4e48f40b0384110082bec52caf38d2d47ce505f5 merged from
AOSP it added a hunk that was already present. Remove the second
copy.
Change-Id: I48b30fd5fe21d6668cc904744fed7d5044fae91d
Craig Mautner [Fri, 25 Apr 2014 03:10:13 +0000 (03:10 +0000)]
am
e5889679: am
3a656ea3: Merge "Too soon." into klp-modular-dev
* commit '
e5889679f69c93f85bca9e94710d5e60a0b1a629':
Too soon.
Craig Mautner [Fri, 25 Apr 2014 03:06:34 +0000 (03:06 +0000)]
am
3a656ea3: Merge "Too soon." into klp-modular-dev
* commit '
3a656ea32e6d6489f4bc45884e5acede9fe2de51':
Too soon.
Craig Mautner [Fri, 25 Apr 2014 03:03:37 +0000 (03:03 +0000)]
Merge "Too soon." into klp-modular-dev
Craig Mautner [Fri, 25 Apr 2014 03:01:40 +0000 (03:01 +0000)]
Too soon.
Change-Id: I1abb1d4841e4e6342c3b861d33ae22e22ed0a161
Elliott Hughes [Fri, 25 Apr 2014 02:06:39 +0000 (02:06 +0000)]
Merge "Track package change."
Elliott Hughes [Fri, 25 Apr 2014 02:05:43 +0000 (19:05 -0700)]
Track package change.
Change-Id: I6a8123d8e69367fc1ce27bac46c4bcec489d73ba
Selim Gurun [Fri, 25 Apr 2014 01:19:31 +0000 (01:19 +0000)]
am
7466e3bb: am
e3fc3073: am
8c2d70f5: Merge "Add a stub for forgotten callback to fix master-gpl."
* commit '
7466e3bbbd13b563e1a5adcc537ea0f132045038':
Add a stub for forgotten callback to fix master-gpl.
Selim Gurun [Fri, 25 Apr 2014 01:15:36 +0000 (01:15 +0000)]
am
e3fc3073: am
8c2d70f5: Merge "Add a stub for forgotten callback to fix master-gpl."
* commit '
e3fc3073826b4fdfa0d1be17fe0c79ccf211ad7d':
Add a stub for forgotten callback to fix master-gpl.
Selim Gurun [Fri, 25 Apr 2014 01:12:46 +0000 (01:12 +0000)]
am
8c2d70f5: Merge "Add a stub for forgotten callback to fix master-gpl."
* commit '
8c2d70f5e8dfe64213f44c29562fe4240779b68b':
Add a stub for forgotten callback to fix master-gpl.
Ruben Brunk [Fri, 25 Apr 2014 01:10:07 +0000 (01:10 +0000)]
Merge "camera2: Add DNG creator class."
Selim Gurun [Fri, 25 Apr 2014 01:08:48 +0000 (01:08 +0000)]
Merge "Add a stub for forgotten callback to fix master-gpl."
Selim Gurun [Fri, 25 Apr 2014 01:04:04 +0000 (18:04 -0700)]
Add a stub for forgotten callback to fix master-gpl.
Change-Id: I375dba89403d09dc39f696de04e0811633ecc803
Selim Gurun [Fri, 25 Apr 2014 00:52:37 +0000 (00:52 +0000)]
am
a6972684: am
f7a19173: am
adad989b: Merge "Add a stub to fix master-gpl"
* commit '
a697268442a68fef255863f0a8a0fa1a610dc340':
Add a stub to fix master-gpl
Dianne Hackborn [Sat, 5 Apr 2014 01:02:06 +0000 (18:02 -0700)]
Initial implementation of new voice interaction API.
This gives a basic working implementation of a persist
running service that can start a voice interaction when
it wants, with the target activity(s) able to go through
the protocol to interact with it. It may even work when
the screen is off by putting the activity manager in the
correct state to act like the screen is on.
Includes a sample app that is a voice interation service
and also has an activity it can launch.
Now that I have this initial implementation, I think I
want to rework some aspects of the API.
Change-Id: I7646d0af8fb4ac768c63a18fe3de43f8091f60e9
Selim Gurun [Fri, 25 Apr 2014 00:47:23 +0000 (00:47 +0000)]
am
f7a19173: am
adad989b: Merge "Add a stub to fix master-gpl"
* commit '
f7a191731f6c840eed9283652648f267589502c2':
Add a stub to fix master-gpl
Craig Mautner [Fri, 25 Apr 2014 00:44:56 +0000 (00:44 +0000)]
am
fbb0796e: am
3359bbe0: Merge "Add test for attribute android:allowEmbedded" into klp-modular-dev
* commit '
fbb0796eb3bbbdfeb3218b9495a0f36f4cf4ed19':
Add test for attribute android:allowEmbedded
Craig Mautner [Fri, 25 Apr 2014 00:42:25 +0000 (00:42 +0000)]
am
3359bbe0: Merge "Add test for attribute android:allowEmbedded" into klp-modular-dev
* commit '
3359bbe02ca645bae2f495df51e7b4001de6c2b1':
Add test for attribute android:allowEmbedded
Selim Gurun [Fri, 25 Apr 2014 00:41:59 +0000 (00:41 +0000)]
am
adad989b: Merge "Add a stub to fix master-gpl"
* commit '
adad989b6a2c736f427526e747dcb89ed9762bab':
Add a stub to fix master-gpl
Selim Gurun [Fri, 25 Apr 2014 00:39:09 +0000 (00:39 +0000)]
Merge "Add a stub to fix master-gpl"
Craig Mautner [Fri, 25 Apr 2014 00:39:05 +0000 (00:39 +0000)]
Merge "Add test for attribute android:allowEmbedded" into klp-modular-dev
Selim Gurun [Fri, 25 Apr 2014 00:29:55 +0000 (17:29 -0700)]
Add a stub to fix master-gpl
Change-Id: I4cadd3a6e33843ccac4ef2eacbe508e40628367c
Christopher Tate [Fri, 25 Apr 2014 00:26:05 +0000 (00:26 +0000)]
Merge "Send factory reset notification broadcasts at foreground priority"
Elliott Hughes [Fri, 25 Apr 2014 00:18:10 +0000 (17:18 -0700)]
resolved conflicts for merge of
02e85744 to master
Change-Id: Id4c0ecfedc7ec4ff4b76331be025817445a652e9
Elliott Hughes [Thu, 24 Apr 2014 23:59:05 +0000 (23:59 +0000)]
am
5f5ca3bc: am
31a1dd2a: Merge "Use the suggested public API instead of libcore.os."
* commit '
5f5ca3bc98fb773ee905289300595ad95d5ffabe':
Use the suggested public API instead of libcore.os.
Chris Craik [Thu, 24 Apr 2014 02:40:28 +0000 (19:40 -0700)]
Refactor Drawable outline production, flesh out Outline methods
Change-Id: I1b8c25384b5f123e86cf5e0b2270eb741bc3159b
Elliott Hughes [Thu, 24 Apr 2014 23:55:09 +0000 (23:55 +0000)]
am
31a1dd2a: Merge "Use the suggested public API instead of libcore.os."
* commit '
31a1dd2a8f56b439861ee335b55f44323318830c':
Use the suggested public API instead of libcore.os.
Elliott Hughes [Thu, 24 Apr 2014 23:52:16 +0000 (23:52 +0000)]
Merge "Use the suggested public API instead of libcore.os."
Andrew Solovay [Thu, 24 Apr 2014 23:48:57 +0000 (23:48 +0000)]
am
9a4db311: am
3cb4430b: am
27547e6d: am
fdc9e56f: Correcting name of \'Backup & reset\' menu.
* commit '
9a4db3114b1f3c5c682ee4c9c6f78651c5fc38b8':
Correcting name of 'Backup & reset' menu.
Andrew Solovay [Thu, 24 Apr 2014 23:45:09 +0000 (23:45 +0000)]
am
3cb4430b: am
27547e6d: am
fdc9e56f: Correcting name of \'Backup & reset\' menu.
* commit '
3cb4430b071e9e978853f73c0cccd15dc2f37a49':
Correcting name of 'Backup & reset' menu.
Dianne Hackborn [Thu, 24 Apr 2014 23:43:49 +0000 (23:43 +0000)]
Merge "Add support for muliple active development codenames."
Andrew Solovay [Thu, 24 Apr 2014 23:41:26 +0000 (23:41 +0000)]
am
27547e6d: am
fdc9e56f: Correcting name of \'Backup & reset\' menu.
* commit '
27547e6d3a22fb9615594769e460c6a86f2dd44b':
Correcting name of 'Backup & reset' menu.
Jungshik Jang [Wed, 23 Apr 2014 08:57:26 +0000 (17:57 +0900)]
Implement skeleton of new HDMI Control Service.
HdmiCecService is a system service handling HDMI-CEC features
and command. Recently we found out that industry has more
requirements to support HDMI-CEC. Also, MHL is another
standard should be in our pocket. Basically, MHL is
a standard to support communication between mobile device
and TV or Av device. As CEC is a control standard over HDMI
cable, MHL has control channel for peer device.
There behavior is very similiar. Both have commands that
can change Tv's current input and can send/receive key
to other device to control other deivce or TV.
In order to cover both CEC and MHL, current HdmiCecService
implementation has limitation. We had several
session of discussion and decided to refactor
HdmiCecService into HdmiControlService.
For each standard it will have separate controller instance
like HdmiCecController and HdmiMhlController.
In this change I didn't touch original HdmiCecService
because some component, like cast receiver, uses HdmiCecService.
For a while we will keep HdmiCecService until HdmiControlService
accomodates all features of HdmiCecService.
Change-Id: I5485280ab803dbf071d898bfbe34be0b11ce7958
Andrew Solovay [Thu, 24 Apr 2014 23:37:40 +0000 (23:37 +0000)]
am
fdc9e56f: Correcting name of \'Backup & reset\' menu.
* commit '
fdc9e56ff8a1019c353e77f5d4b5f3566d173941':
Correcting name of 'Backup & reset' menu.
Christopher Tate [Thu, 24 Apr 2014 23:28:41 +0000 (23:28 +0000)]
Merge "Fix native-lib dir assignment & updating"
Selim Gurun [Thu, 24 Apr 2014 23:26:08 +0000 (23:26 +0000)]
Merge "Add ClientCert support"
Winson Chung [Thu, 24 Apr 2014 23:24:39 +0000 (23:24 +0000)]
Merge "Enabling doc centric recents on phones."
Elliott Hughes [Thu, 24 Apr 2014 00:58:57 +0000 (17:58 -0700)]
Use the suggested public API instead of libcore.os.
Change-Id: Id392e4c36c5721ca609d88d9ec6b9340ce05274c
Ruben Brunk [Thu, 20 Mar 2014 00:42:12 +0000 (17:42 -0700)]
camera2: Add DNG creator class.
Change-Id: I11a0e5990adeca6012778f0dc71a421b85cbf53a
Dianne Hackborn [Thu, 24 Apr 2014 20:06:27 +0000 (13:06 -0700)]
Add support for muliple active development codenames.
The resource API level is also bumped by the number of
active codenames there are.
Change-Id: Ic1bac452d5c13dc3f48040ffa47f54b28abe2ccc
Christopher Tate [Wed, 23 Apr 2014 23:55:57 +0000 (16:55 -0700)]
Fix native-lib dir assignment & updating
The per-package /system/lib/* feature introduced bugs in the
native library path handling during app upgrade installs. The
crux of the fix is that when recalulating the desired native
library directory, the basis for the calculation needs to be
the scanned APK's location rather than the extant package
settings entry -- because that entry refers to the pre-upgrade
state of the application, not the new state.
Bug
14233983
Change-Id: I76c3249c72ecc055115d430529d386599e52ae42
Andrew Solovay [Thu, 24 Apr 2014 22:47:38 +0000 (15:47 -0700)]
Correcting name of 'Backup & reset' menu.
Doc is staged at
http://asolovay.mtv.corp.google.com:9000/guide/topics/data/backup.html#Testing
Bug:
14253720
Change-Id: Ib8eb213d8708c02c93c8bc93233db2c828caa925
Mark Salyzyn [Thu, 24 Apr 2014 22:19:51 +0000 (22:19 +0000)]
am
fc02fcc8: am
eacaa353: am
c717179e: Merge "jni: android_util_Process 64 bit issues"
* commit '
fc02fcc8a4ad181c44ca41a99cc86e1d23844d0c':
jni: android_util_Process 64 bit issues
Mark Salyzyn [Thu, 24 Apr 2014 22:17:11 +0000 (22:17 +0000)]
am
eacaa353: am
c717179e: Merge "jni: android_util_Process 64 bit issues"
* commit '
eacaa353e83942d3c59d0db594df0fb6179e0eea':
jni: android_util_Process 64 bit issues
ztenghui [Thu, 24 Apr 2014 22:17:01 +0000 (22:17 +0000)]
Merge "Format the xml files for the VectorDrawableTest"
Mark Salyzyn [Thu, 24 Apr 2014 22:14:02 +0000 (22:14 +0000)]
am
c717179e: Merge "jni: android_util_Process 64 bit issues"
* commit '
c717179e4fec346334fe4bb8603184499b746179':
jni: android_util_Process 64 bit issues
Christopher Tate [Thu, 24 Apr 2014 22:13:13 +0000 (15:13 -0700)]
Send factory reset notification broadcasts at foreground priority
Bug
14296706
Change-Id: I07b39e808dbf724f5edd4a11445de3e47c9e862b
Mark Salyzyn [Thu, 24 Apr 2014 22:10:22 +0000 (22:10 +0000)]
Merge "jni: android_util_Process 64 bit issues"
Chris Craik [Thu, 24 Apr 2014 21:56:41 +0000 (21:56 +0000)]
Merge "Add floats-only drawRoundRect to Canvas"
Selim Gurun [Wed, 26 Mar 2014 21:10:28 +0000 (14:10 -0700)]
Add ClientCert support
Bug:
12983007
This is to add APIs for client certificates. Keep the APIs hidden
until finalizing the design.
Change-Id: I8a1e755e2c509cf821dff7c7df0ddd5270a5f79b
Chris Craik [Thu, 24 Apr 2014 21:13:40 +0000 (14:13 -0700)]
Add floats-only drawRoundRect to Canvas
Change-Id: Ib0033a2d2486a808a44984ec4adf7fef76d9ea17
Kenny Root [Thu, 24 Apr 2014 20:51:49 +0000 (20:51 +0000)]
Merge "PackageManager: remove GET_CERTIFICATES boolean"
Kenny Root [Thu, 24 Apr 2014 20:38:03 +0000 (13:38 -0700)]
PackageManager: remove GET_CERTIFICATES boolean
This is a really old debugging flag that is not useful and also
dangerous.
Change-Id: I3badb5e361a8fe8458a355bf7d9ab055cb1b57d5
Jorim Jaggi [Thu, 24 Apr 2014 20:34:30 +0000 (20:34 +0000)]
Merge "Add text view for double-tap and unlock hint on Keyguard."
Mark Salyzyn [Thu, 24 Apr 2014 20:05:18 +0000 (13:05 -0700)]
jni: android_util_Process 64 bit issues
- critical issue with using %lld to scanf into a jlong
- subsidiary issues with mix jint, jsize and jlong printing
Change-Id: I77c6b3d3a202fec741cacc540fc39ad6cba25f52
Jorim Jaggi [Thu, 24 Apr 2014 20:08:30 +0000 (22:08 +0200)]
Add text view for double-tap and unlock hint on Keyguard.
Bug:
14080971
Change-Id: Id6f7344b01bb9666fe6add415ec4a28163315967
Raph Levien [Thu, 24 Apr 2014 19:51:35 +0000 (12:51 -0700)]
Followon fix for
14276128 Clipping at bottom of TextView
The previous fix did not work when the text was ellipsized, because the
test for whether the line was the last line was incorrect. The new test
handles both the end of the buffer and the case where it is the last
line because of ellipsizing.
So this should be the proper fix for bug
14276128 Clipping at bottom of
TextView when lineSpacingMultiplier < 1
Change-Id: Iac5c96f2273142031c18a27f504f7d6d5fcf823e
Allen Hair [Thu, 24 Apr 2014 18:50:37 +0000 (11:50 -0700)]
Fix nativeGetAnimationFrameStats to use the correct times.
Changed the method to use actualPresentTimesNano instead of
desiredPresentTimesNano when initializing WindowAnimationFrameStats. The
WindowAnimationFrameStats.init(..) method expects the actual
presentation times, not the posted times.
Additionally, the desiredPresentTimesNano values are all invalid
(INT64_MAX) when working with window animation frames.
Change-Id: I5e5ce888dac859179ef06e4bbd8bfbd959521dd2
Dianne Hackborn [Thu, 24 Apr 2014 19:00:29 +0000 (19:00 +0000)]
Merge "Fix api."
Dianne Hackborn [Thu, 24 Apr 2014 18:59:49 +0000 (11:59 -0700)]
Fix api.
Change-Id: I5a04152a55b277b8609b033a0c35db30458e1ee2
Jeff Davidson [Thu, 24 Apr 2014 18:58:56 +0000 (18:58 +0000)]
Merge "API tweaks for network score settings."
Nick Kralevich [Thu, 24 Apr 2014 18:29:50 +0000 (18:29 +0000)]
am
69ee6b0a: am
140dc63f: am
84803849: Merge "Zygote: enable CAP_BLOCK_SUSPEND capability for system server"
* commit '
69ee6b0a774346af5e621907a0508c02468b4186':
Zygote: enable CAP_BLOCK_SUSPEND capability for system server
Dianne Hackborn [Thu, 24 Apr 2014 18:28:32 +0000 (18:28 +0000)]
Merge "Start collecting mobile radio activity from the radio."
Nick Kralevich [Thu, 24 Apr 2014 18:25:58 +0000 (18:25 +0000)]
am
140dc63f: am
84803849: Merge "Zygote: enable CAP_BLOCK_SUSPEND capability for system server"
* commit '
140dc63f4f927a8eddddf8d11a142e6975c1c6cf':
Zygote: enable CAP_BLOCK_SUSPEND capability for system server
Nick Kralevich [Thu, 24 Apr 2014 18:22:20 +0000 (18:22 +0000)]
am
84803849: Merge "Zygote: enable CAP_BLOCK_SUSPEND capability for system server"
* commit '
8480384986c314bd97b841cbf7f63acb7055ecef':
Zygote: enable CAP_BLOCK_SUSPEND capability for system server
Dianne Hackborn [Mon, 21 Apr 2014 22:56:18 +0000 (15:56 -0700)]
Start collecting mobile radio activity from the radio.
Hook in to the new radio API to find out when the radio
is active and use that to track its state in batter stats.
We also still have the data being tracked from the kernel's
emulation, and continue to use that if we don't get data from
the radio.
Currently this monitoring is turned off until some issues
in the radio can be fixed that are providing bad data.
Also add a new API to get estimated drain and charge times.
Change-Id: Ifc4900fabb8f848f9cda361dce698664ea75f175
Adam Powell [Thu, 24 Apr 2014 18:20:43 +0000 (18:20 +0000)]
Merge "Nested scrolling!"
Nick Kralevich [Thu, 24 Apr 2014 18:18:01 +0000 (18:18 +0000)]
Merge "Zygote: enable CAP_BLOCK_SUSPEND capability for system server"
Daniel Leung [Fri, 20 Dec 2013 18:37:35 +0000 (10:37 -0800)]
Zygote: enable CAP_BLOCK_SUSPEND capability for system server
Starting from kernel 3.6, it requires processes to have the capability
CAP_BLOCK_SUSPEND to set/unset wake locks. Adds CAP_BLOCK_SUSPEND
to the list of capabilities for system server, so that PowerManager
can set wake locks.
Change-Id: I3246e6f6e6cb8f0bedb1c0417ed07085ee1f3aaa
Signed-off-by: Daniel Leung <daniel.leung@intel.com>
ztenghui [Thu, 24 Apr 2014 18:02:59 +0000 (18:02 +0000)]
Merge "Shoot the rays to the vertices of the incoming polygon."
Adam Powell [Tue, 15 Apr 2014 16:46:51 +0000 (09:46 -0700)]
Nested scrolling!
or, "Excuse me, Egon, you said crossing the streams was bad."
Add API for driving a nested scroll from the most deeply nested
applicable scrolling view. The deepest scrolling view dispatches
high-level scrolling events up to cooperative parent views.
Augment ScrollView to support nested scrolling. Next up, more public
framework scrolling views.
Change-Id: I53b5e207fcdece796e08c8592ddb4496b96f600e
Craig Mautner [Thu, 24 Apr 2014 17:44:42 +0000 (17:44 +0000)]
Merge "Take screenshots of pausing activity"
Craig Mautner [Thu, 24 Apr 2014 17:19:20 +0000 (10:19 -0700)]
Take screenshots of pausing activity
Previous CL to optimize out excessive screenshots (ag/379669) was too
effective and didn't take screenshots when going into an activity
that had attribute Window_windowNoDisplay. Adding in the test for
ActivityRecord.noDisplay allows screenshots for this situation.
Fixes bug
13410507.
Change-Id: Ieafebf44b7d1a3ba18115e762fba113f8d1c0252
Craig Mautner [Thu, 24 Apr 2014 17:27:04 +0000 (10:27 -0700)]
resolved conflicts for merge of
f8a58208 to master
Conflicts:
core/java/android/content/pm/PackageParser.java
core/res/res/values/attrs_manifest.xml
core/res/res/values/public.xml
Change-Id: I747772e9dbc7ee1cf8993e574de4b3215f6833b2
ztenghui [Tue, 22 Apr 2014 22:29:44 +0000 (15:29 -0700)]
Format the xml files for the VectorDrawableTest
All automatically done by the tool.
No real changes.
Change-Id: I8a98be9441d7cb0b3636c2a850d1e7de9e79394f
Alexandra Gherghina [Thu, 24 Apr 2014 17:11:51 +0000 (17:11 +0000)]
Merge "Fix two potential NPEs in DeviceInfo"
Alexandra Gherghina [Thu, 24 Apr 2014 16:55:30 +0000 (17:55 +0100)]
Fix two potential NPEs in DeviceInfo
Change-Id: Ic4b5b203af25cda9ae65b477c92c1fb5f31ab093
ztenghui [Tue, 22 Apr 2014 18:21:49 +0000 (11:21 -0700)]
Shoot the rays to the vertices of the incoming polygon.
bug:
13553955
Change-Id: I4825a49e8eaab969c40f2ee4086f7669c9c6fd29