OSDN Git Service
Nicolas Prevot [Mon, 24 Mar 2014 13:44:38 +0000 (13:44 +0000)]
Introduce forwarding intents across profiles.
The package manager service maintains, for some user ids, a list of forwarding intent filters.
A forwarding intent filter is an intent filter with a destination (a user id).
If an intent matches the forwarding intent filter, then activities in the destination can also respond to the intent.
When the package manager service is asked for components that resolve an intent:
If the intent matches the forwarding intent filter, and at least one activity in the destination user can respond to the intent:
The package manager service also returns the IntentForwarderActivity.
This activity will forward the intent to the destination.
Change-Id: Id8957de3e4a4fdbc1e0dea073eadb45e04ef985a
Narayan Kamath [Wed, 30 Apr 2014 08:34:56 +0000 (08:34 +0000)]
Merge "Create arch specific cache dirs during zygote startup."
Narayan Kamath [Fri, 25 Apr 2014 10:43:22 +0000 (11:43 +0100)]
Create arch specific cache dirs during zygote startup.
The runtime expects them to exist before it's launched.
The boot image / art files are created during the first
zygote launch.
Change-Id: I5ed0ad4854dc7785246344c8f6eaf54e560feb7d
John Spurlock [Wed, 30 Apr 2014 01:53:09 +0000 (01:53 +0000)]
Merge "Zen mode tweaks."
John Spurlock [Wed, 30 Apr 2014 01:48:26 +0000 (21:48 -0400)]
Zen mode tweaks.
- Fix regression with alarms.
- Run all condition provider callbacks on the main thread.
- Exit zen mode if the current condition is disabled / uninstalled.
Bug:
14402762
Change-Id: I0746670c1910047a9dc9b7e29aa1a6c3899fd9fe
Deepanshu Gupta [Wed, 30 Apr 2014 00:45:25 +0000 (00:45 +0000)]
am
4bf3c930: (-s ours) am
92bc0753: am
8c15cd0d: am
c967d8dc: Add special system view cookie to OverflowButton. [DO NOT MERGE]
* commit '
4bf3c930684b1e697c87d3fdb520309c39e51b14':
Add special system view cookie to OverflowButton. [DO NOT MERGE]
Deepanshu Gupta [Wed, 30 Apr 2014 00:41:26 +0000 (00:41 +0000)]
am
92bc0753: am
8c15cd0d: am
c967d8dc: Add special system view cookie to OverflowButton. [DO NOT MERGE]
* commit '
92bc07534e511b9afa7edaffe867d2674c504d73':
Add special system view cookie to OverflowButton. [DO NOT MERGE]
Deepanshu Gupta [Wed, 30 Apr 2014 00:38:35 +0000 (00:38 +0000)]
am
8c15cd0d: am
c967d8dc: Add special system view cookie to OverflowButton. [DO NOT MERGE]
* commit '
8c15cd0dc1d04490b82fd7d8da7611ff3219a1f0':
Add special system view cookie to OverflowButton. [DO NOT MERGE]
Deepanshu Gupta [Wed, 30 Apr 2014 00:30:29 +0000 (00:30 +0000)]
am
c967d8dc: Add special system view cookie to OverflowButton. [DO NOT MERGE]
* commit '
c967d8dc62c429ecf3e27bf3714a953636e75cbf':
Add special system view cookie to OverflowButton. [DO NOT MERGE]
Joe Onorato [Tue, 29 Apr 2014 23:50:28 +0000 (23:50 +0000)]
Merge "Turn off this very verbose log."
Deepanshu Gupta [Fri, 25 Apr 2014 18:07:19 +0000 (11:07 -0700)]
Add special system view cookie to OverflowButton. [DO NOT MERGE]
Add a special view cookie to enable the IDE to identify the overflow
menu button in the Action Bar.
Change-Id: Ida3ed776afb8c9fa8af23b73d4cf6d47eef0ab87
(cherry picked from commit
674af92fd3a618695448ff88568b03390e90bc66)
Joe Onorato [Tue, 29 Apr 2014 23:19:06 +0000 (16:19 -0700)]
Turn off this very verbose log.
adb shell dumpsys activity broadcasts
has the last 100 broadcasts, so it can be used for debugging
instead of spamming the main logs.
Change-Id: I19c3ac72eb783999e615261da7f00b527d2bc06f
Guang Zhu [Tue, 29 Apr 2014 23:12:16 +0000 (23:12 +0000)]
am
f0a3ea6e: am
c6ebc0d1: Merge "make success explicit in BT instrumentation util" into klp-modular-dev
* commit '
f0a3ea6ea259f836c71007ab07966d9dd2a140d6':
make success explicit in BT instrumentation util
Guang Zhu [Tue, 29 Apr 2014 23:09:12 +0000 (23:09 +0000)]
am
c6ebc0d1: Merge "make success explicit in BT instrumentation util" into klp-modular-dev
* commit '
c6ebc0d120bd7faa61d2f906f4a180c720f1f0d8':
make success explicit in BT instrumentation util
Guang Zhu [Tue, 29 Apr 2014 23:06:39 +0000 (23:06 +0000)]
Merge "make success explicit in BT instrumentation util" into klp-modular-dev
Nick Kralevich [Tue, 29 Apr 2014 22:34:54 +0000 (22:34 +0000)]
am
ab583454: am
1866e5dc: am
af40649e: Merge "Set NO_NEW_PRIVS on zygote init"
* commit '
ab5834545da906f1a150672ead825c28a2e1f82a':
Set NO_NEW_PRIVS on zygote init
Michael Wright [Tue, 29 Apr 2014 22:31:05 +0000 (22:31 +0000)]
Merge "Move key attribute information into KeyEvent."
Nick Kralevich [Tue, 29 Apr 2014 22:26:41 +0000 (22:26 +0000)]
am
1866e5dc: am
af40649e: Merge "Set NO_NEW_PRIVS on zygote init"
* commit '
1866e5dc8bb04b58a67e54f66cb4ec22e878667d':
Set NO_NEW_PRIVS on zygote init
Nick Kralevich [Tue, 29 Apr 2014 22:24:32 +0000 (22:24 +0000)]
am
af40649e: Merge "Set NO_NEW_PRIVS on zygote init"
* commit '
af40649e4ad506e312b53518cd2b9f2b58dee3ba':
Set NO_NEW_PRIVS on zygote init
Nick Kralevich [Tue, 29 Apr 2014 22:20:47 +0000 (22:20 +0000)]
Merge "Set NO_NEW_PRIVS on zygote init"
Nick Kralevich [Fri, 25 Apr 2014 22:01:24 +0000 (15:01 -0700)]
Set NO_NEW_PRIVS on zygote init
When app_process/zygote starts, make sure PR_SET_NO_NEW_PRIVS is set.
This prevents zygote spawned apps from acquiring new privileges
on exec.
In particular, this allows the CTS test
android.os.cts.SecurityFeaturesTest#testNoNewPrivs() to pass if ART is set
as the default runtime.
Change-Id: I81139cda999c7b1430242561aad28f566e9b6da0
Selim Cinek [Tue, 29 Apr 2014 22:03:16 +0000 (22:03 +0000)]
Merge "Introduced basic animations for the new notifications."
Selim Cinek [Fri, 25 Apr 2014 14:43:27 +0000 (16:43 +0200)]
Introduced basic animations for the new notifications.
Animations between two different states of the notification stack scroller
are now possible.
Bug:
14081264
Change-Id: I2b8e964095f71766feac5a76c4e3b85d22648d35
Dianne Hackborn [Tue, 29 Apr 2014 21:54:58 +0000 (21:54 +0000)]
Merge "Add IBatteryStats API to retrieve current charge times."
Dianne Hackborn [Tue, 29 Apr 2014 21:53:32 +0000 (14:53 -0700)]
Add IBatteryStats API to retrieve current charge times.
Also include charge/discharge information in dumpsys.
Change-Id: Ica1b333ad334dc698d4a67da391b378757662f41
Jinsuk Kim [Tue, 29 Apr 2014 21:38:19 +0000 (21:38 +0000)]
am
60037302: am
8fe27e88: Merge "Move logical address allocation logic into native service from HAL" into klp-modular-dev
* commit '
60037302208be033442cc3f3c50a25c7064ebbd1':
Move logical address allocation logic into native service from HAL
Jinsuk Kim [Tue, 29 Apr 2014 21:35:01 +0000 (21:35 +0000)]
am
8fe27e88: Merge "Move logical address allocation logic into native service from HAL" into klp-modular-dev
* commit '
8fe27e881851921a90882f7d4da142bf936c5549':
Move logical address allocation logic into native service from HAL
Jinsuk Kim [Tue, 29 Apr 2014 21:32:49 +0000 (21:32 +0000)]
Merge "Move logical address allocation logic into native service from HAL" into klp-modular-dev
George Mount [Tue, 29 Apr 2014 21:30:37 +0000 (21:30 +0000)]
Merge "Add mechanism for Transitions to target a class."
George Mount [Tue, 29 Apr 2014 21:30:26 +0000 (21:30 +0000)]
Merge "Transfer image of shared element to launched Activity."
Jorim Jaggi [Tue, 29 Apr 2014 21:23:03 +0000 (21:23 +0000)]
Merge "Prevent expanded notifications on lockscreen."
Jorim Jaggi [Tue, 29 Apr 2014 21:12:24 +0000 (23:12 +0200)]
Prevent expanded notifications on lockscreen.
Change-Id: I9a0ffca823883cfed75d0e093f5a4364b20008b3
Baligh Uddin [Tue, 29 Apr 2014 21:13:42 +0000 (21:13 +0000)]
am
86af7745: (-s ours) am
c2e5503d: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev
* commit '
86af7745d337f79b37e25e21f699bf04a46838be':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 29 Apr 2014 21:07:16 +0000 (21:07 +0000)]
am
c2e5503d: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev
* commit '
c2e5503dbae833065a16fe35296e202db3887920':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 29 Apr 2014 21:02:59 +0000 (21:02 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-modular-dev
Baligh Uddin [Tue, 29 Apr 2014 21:02:58 +0000 (21:02 +0000)]
Merge "Import translations. DO NOT MERGE"
Baligh Uddin [Tue, 29 Apr 2014 21:02:36 +0000 (21:02 +0000)]
Merge "Import translations. DO NOT MERGE"
Baligh Uddin [Tue, 29 Apr 2014 21:02:32 +0000 (21:02 +0000)]
Merge "Import translations. DO NOT MERGE"
George Mount [Tue, 29 Apr 2014 20:56:17 +0000 (20:56 +0000)]
Merge "Add Transform and ClipBounds Transitions."
Jorim Jaggi [Tue, 29 Apr 2014 20:52:34 +0000 (20:52 +0000)]
Merge "Remove "speedbump" to expand notification with one finger."
Jorim Jaggi [Tue, 29 Apr 2014 20:47:53 +0000 (22:47 +0200)]
Remove "speedbump" to expand notification with one finger.
Change-Id: I16b2493142adc277a3cb11ab9a88040aab6e3f47
George Mount [Tue, 29 Apr 2014 20:49:26 +0000 (20:49 +0000)]
Merge "Add ability to exclude Views in transition XML."
Selim Cinek [Tue, 29 Apr 2014 20:46:12 +0000 (20:46 +0000)]
Merge "Refactored the layout of a notifications"
Jorim Jaggi [Mon, 28 Apr 2014 15:51:23 +0000 (17:51 +0200)]
Refactored the layout of a notifications
Notifications now consist of ExpandableViews instead of SizeAdaptiveLayouts
to avoid layout passes during the resizing. The StackScrollAlgorithm and its
States are also refactored in order to support the new behaviour. In addition,
the generation of the outline is moved to the notification views instead of
the container which contains them.
Change-Id: I1ac1292a6520f5951610039bfa204c204be9d640
John Spurlock [Tue, 29 Apr 2014 20:33:47 +0000 (20:33 +0000)]
Merge "Subscribe to default zen mode condition."
John Spurlock [Tue, 29 Apr 2014 20:31:13 +0000 (16:31 -0400)]
Subscribe to default zen mode condition.
Otherwise re-opening the current QS panel does not force an unsubscribe
(if a non-default condition was subscribed).
Change-Id: I1ec2519cc051d435c2ebbe8cea4a9b54f256820d
Jae Seo [Tue, 29 Apr 2014 20:21:51 +0000 (20:21 +0000)]
Merge "Add more URI patterns for accessing TV metadata"
Zhijun He [Tue, 29 Apr 2014 20:16:02 +0000 (20:16 +0000)]
Merge "Camera2: Update availableFormats related key docs"
George Mount [Thu, 24 Apr 2014 15:57:03 +0000 (08:57 -0700)]
Add mechanism for Transitions to target a class.
Bug
14289299
Added ability to target a specific class similarly to the
mechanism for excluding a specific class in Transitions.
Also changed XML tag from excludeTargetId to excludeId to
make it symmetric with excludeClass.
Change-Id: Ib371820ec75761243e75b659565b905b1b19c9a2
George Mount [Tue, 15 Apr 2014 16:01:32 +0000 (09:01 -0700)]
Transfer image of shared element to launched Activity.
First pass of the API will use a Bitmap. Future versions will use
more efficient mechanisms.
Change-Id: I111474dd031fef0b86de871017c85dc679166acf
George Mount [Tue, 15 Apr 2014 16:01:32 +0000 (09:01 -0700)]
Add Transform and ClipBounds Transitions.
Made MoveImage use an overlay view. Drawables
cover all Views in the overlay and there may
be a desire to order the overlays.
Change-Id: Ic7b81f0d26d8cce3f475c2eebbce01538bc55d46
George Mount [Tue, 15 Apr 2014 16:01:32 +0000 (09:01 -0700)]
Add ability to exclude Views in transition XML.
Bug
14259955
Change-Id: I47bb10c530c9fec8910ddd96156fc38d6027e1f6
Deepanshu Gupta [Tue, 29 Apr 2014 19:54:25 +0000 (19:54 +0000)]
Merge "Add special system view cookie to OverflowButton."
Zhijun He [Tue, 29 Apr 2014 19:35:27 +0000 (12:35 -0700)]
Camera2: Update availableFormats related key docs
Change-Id: I1cd2a39ee6a4d3ec391fa827accaa8ad1b3dfc6e
Chris Craik [Tue, 29 Apr 2014 19:24:47 +0000 (19:24 +0000)]
Merge "Add Z property to View"
Selim Gurun [Tue, 29 Apr 2014 18:52:21 +0000 (18:52 +0000)]
am
2e3b36a2: (-s ours) am
c23f5651: (-s ours) am
5c220cc4: (-s ours) Merge "DO NOT MERGE Add invokeFunctor stub"
* commit '
2e3b36a2713b7b100172f91ab019d7bd256365f1':
DO NOT MERGE Add invokeFunctor stub
Selim Gurun [Tue, 29 Apr 2014 18:49:24 +0000 (18:49 +0000)]
am
c23f5651: (-s ours) am
5c220cc4: (-s ours) Merge "DO NOT MERGE Add invokeFunctor stub"
* commit '
c23f5651fd40eca1b751376c369fd9f3c9deb64e':
DO NOT MERGE Add invokeFunctor stub
Selim Gurun [Tue, 29 Apr 2014 18:45:53 +0000 (18:45 +0000)]
am
5c220cc4: (-s ours) Merge "DO NOT MERGE Add invokeFunctor stub"
* commit '
5c220cc4e4c0584a9083529b58e30e17ab7d2d9e':
DO NOT MERGE Add invokeFunctor stub
Selim Gurun [Tue, 29 Apr 2014 18:42:25 +0000 (18:42 +0000)]
Merge "DO NOT MERGE Add invokeFunctor stub"
Bo Liu [Tue, 29 Apr 2014 18:38:37 +0000 (11:38 -0700)]
DO NOT MERGE Add invokeFunctor stub
Change-Id: Ib7637d68c4f63065b909075a8f5d8cd1dd0674bd
Dianne Hackborn [Tue, 29 Apr 2014 18:30:08 +0000 (18:30 +0000)]
Merge "Implement better computing of battery drain time, actual charge time."
Dianne Hackborn [Tue, 29 Apr 2014 18:23:16 +0000 (11:23 -0700)]
Implement better computing of battery drain time, actual charge time.
Also move time formatter in to framework for use elsewhere.
Change-Id: I42b6a44414b68754af65c522bef5591da5643909
Kenny Root [Thu, 24 Apr 2014 18:44:47 +0000 (11:44 -0700)]
Only remember the signer certificates for Signatures
Previously we would use the JarEntry#getCertificates API which would
return a flattened array of all the signers and their certificate chain.
Since this isn't what was intended, switch to reading the certificate
chains and only paying attention to the signer certificate.
In order to migrate during upgrades of the platform, we'll scan on boot
with a compatibility mode which will check the stores signatures in the
old format by flattening the chains of the scanned packages then
comparing the two sets.
Bug:
13678484
Change-Id: I02a5c53121d8d6f70a51d7e3b98168a41e11482e
John Reck [Tue, 29 Apr 2014 17:56:04 +0000 (17:56 +0000)]
Merge "RenderThread animator support"
John Reck [Tue, 15 Apr 2014 16:50:16 +0000 (09:50 -0700)]
RenderThread animator support
Change-Id: Icf29098edfdaf7ed550bbe9d49e9eaefb4167084
ztenghui [Tue, 29 Apr 2014 16:21:51 +0000 (16:21 +0000)]
Merge "Make sure the theta is correctly represented and incoming polygon is CW for shadow."
Glenn Kasten [Tue, 29 Apr 2014 16:14:43 +0000 (16:14 +0000)]
Merge "Add CHANNEL_OUT_QUAD_SIDE and CHANNEL_OUT_5POINT1_SIDE"
Selim Cinek [Tue, 29 Apr 2014 15:57:01 +0000 (15:57 +0000)]
Merge "Fixed a bug where the outline was not correctly updated"
Selim Cinek [Tue, 29 Apr 2014 12:41:36 +0000 (14:41 +0200)]
Fixed a bug where the outline was not correctly updated
The outline was not correctly copied to the field when it already
existed.
Change-Id: I02a7006f7ceff9241b1c52c73ea159c59aa7464e
Nicolas Prevot [Tue, 29 Apr 2014 10:35:26 +0000 (10:35 +0000)]
Merge "Small fix in DeviceOwner.java."
Nicolas Prevot [Tue, 29 Apr 2014 09:39:01 +0000 (10:39 +0100)]
Small fix in DeviceOwner.java.
Change-Id: Ibfa4ae7b1bc269bc51532026f8a6cc3c75cc42bf
Jae Seo [Tue, 29 Apr 2014 06:22:00 +0000 (06:22 +0000)]
Merge "Dispatch input events to the TV input"
Jae Seo [Fri, 18 Apr 2014 04:35:29 +0000 (21:35 -0700)]
Dispatch input events to the TV input
TvInputManagerService now creates an InputChannel pair and passes one
end to the app and the other end to the service. Then the TvInputManager
in the app creates an InputEventSender around one end of the channel to
send events and the service creates an InputEventReceiver around the
other end of the channel to receive events.
Most of the newly added code here was borrowed heavily from the IME.
Change-Id: I0bd83847cba0033ccb6f4b6dad267ebeaf5e9c7c
Elliott Hughes [Tue, 29 Apr 2014 04:09:43 +0000 (04:09 +0000)]
am
45641ecd: am
7af8f5ba: am
10d57c4b: Merge "Fix two zygote imports."
* commit '
45641ecd2c4be60390319614f519d2313dbd547d':
Fix two zygote imports.
Elliott Hughes [Tue, 29 Apr 2014 04:05:27 +0000 (04:05 +0000)]
am
c4e6f6d2: am
cf939672: am
2e9d924d: Merge "Remove unused import."
* commit '
c4e6f6d2827ad526f562a5882975f42eee69486c':
Remove unused import.
Elliott Hughes [Tue, 29 Apr 2014 04:05:25 +0000 (04:05 +0000)]
am
7af8f5ba: am
10d57c4b: Merge "Fix two zygote imports."
* commit '
7af8f5ba9cc7801fabe70bcf13e602aaa73dc428':
Fix two zygote imports.
Elliott Hughes [Tue, 29 Apr 2014 04:01:25 +0000 (04:01 +0000)]
am
cf939672: am
2e9d924d: Merge "Remove unused import."
* commit '
cf939672f8c6e1ee29ae38f0e3665ab966491f7f':
Remove unused import.
Elliott Hughes [Tue, 29 Apr 2014 04:01:01 +0000 (04:01 +0000)]
am
10d57c4b: Merge "Fix two zygote imports."
* commit '
10d57c4bc7459d0c73b254af006a3528e9a0c33e':
Fix two zygote imports.
Elliott Hughes [Tue, 29 Apr 2014 03:56:19 +0000 (03:56 +0000)]
am
2e9d924d: Merge "Remove unused import."
* commit '
2e9d924d4f4275c72df4be28d85482064cee43f8':
Remove unused import.
Elliott Hughes [Tue, 29 Apr 2014 03:54:49 +0000 (03:54 +0000)]
Merge "Fix two zygote imports."
Elliott Hughes [Tue, 29 Apr 2014 03:53:52 +0000 (20:53 -0700)]
Fix two zygote imports.
Change-Id: I5eea2d9f48479c33e1594aaa259274e5e787a1df
Elliott Hughes [Tue, 29 Apr 2014 03:52:10 +0000 (03:52 +0000)]
Merge "Remove unused import."
Elliott Hughes [Tue, 29 Apr 2014 03:51:34 +0000 (20:51 -0700)]
Remove unused import.
Change-Id: I3f6a035cda55859a7a521f3117da72ee962beb63
Elliott Hughes [Tue, 29 Apr 2014 03:49:24 +0000 (20:49 -0700)]
Fix a few more stray libcore.io references.
Change-Id: Id328544bd3a382fec16507d0ae5b699fef44ebd7
Elliott Hughes [Tue, 29 Apr 2014 03:45:31 +0000 (20:45 -0700)]
Fix build.
Change-Id: I9e1a5280d3356e8814e505915bbc74200bc58b40
Guang Zhu [Tue, 29 Apr 2014 03:12:35 +0000 (20:12 -0700)]
make success explicit in BT instrumentation util
Change-Id: I6c8eb8cdb7928fa6a7c1bc96b374667d1d6ae6a1
Elliott Hughes [Tue, 29 Apr 2014 02:38:02 +0000 (02:38 +0000)]
am
3e792ef7: am
fff28619: am
f4a7ac00: Merge "Move the Zygote off libcore.os and onto android.system."
* commit '
3e792ef78fbad1df75e97da9a32a5826371b2da9':
Move the Zygote off libcore.os and onto android.system.
Elliott Hughes [Tue, 29 Apr 2014 02:34:37 +0000 (02:34 +0000)]
am
fff28619: am
f4a7ac00: Merge "Move the Zygote off libcore.os and onto android.system."
* commit '
fff28619d8f3b2fa7577c3e101d3fcd45f26f3a4':
Move the Zygote off libcore.os and onto android.system.
Elliott Hughes [Tue, 29 Apr 2014 02:31:34 +0000 (02:31 +0000)]
am
f4a7ac00: Merge "Move the Zygote off libcore.os and onto android.system."
* commit '
f4a7ac00a734343b8d2760def352cbdf99fa08c7':
Move the Zygote off libcore.os and onto android.system.
Elliott Hughes [Tue, 29 Apr 2014 02:28:06 +0000 (02:28 +0000)]
Merge "Move the Zygote off libcore.os and onto android.system."
Elliott Hughes [Tue, 29 Apr 2014 02:19:13 +0000 (19:19 -0700)]
Move the Zygote off libcore.os and onto android.system.
Change-Id: Iaa20e50b05fad355bdf15bcfdc58efc9941c400c
Alan Viverette [Tue, 29 Apr 2014 00:13:35 +0000 (00:13 +0000)]
Merge "Fix alert dialog icon"
Chris Craik [Tue, 29 Apr 2014 00:00:21 +0000 (17:00 -0700)]
Add Z property to View
Change-Id: Iff0b2fc616c650c46e5567a1cc81301afffcbfce
ztenghui [Mon, 28 Apr 2014 23:43:13 +0000 (16:43 -0700)]
Make sure the theta is correctly represented and incoming polygon is CW for shadow.
Now the theta = 0 should be on +x axis.
And cos(theta) should correctly represent x value.
Without this fix, the poly theta (from atan2) can be wrongly rotated 90 degrees.
Also, make sure the incoming polygon is CW for the shadow system.
This fix visual artifacts in recent regression for spot shadows.
bug:
13553955
Change-Id: I9bbf54db094e7f133326da4dae4610962da849c1
Winson Chung [Mon, 28 Apr 2014 23:43:02 +0000 (23:43 +0000)]
Merge "Fixing NPE. (Bug
14385152)"
Elliott Hughes [Mon, 28 Apr 2014 23:40:04 +0000 (23:40 +0000)]
Merge "Move internal libcore.os users over to android.system."
Elliott Hughes [Mon, 28 Apr 2014 23:38:43 +0000 (16:38 -0700)]
Move internal libcore.os users over to android.system.
Change-Id: I84e1ace19ba3b4e58d7bb24f3ecda1bdf5dc75a5
Chris Craik [Mon, 28 Apr 2014 23:38:31 +0000 (16:38 -0700)]
Fix build
Change-Id: I4f55b27425899f25cb22d4466e3413ad27b5a302
Jae Seo [Mon, 28 Apr 2014 07:04:19 +0000 (16:04 +0900)]
Add more URI patterns for accessing TV metadata
The following URI patterns are added:
content://com.android.tv/input/*/*/channel
content://com.android.tv/input/*/*/channel?browsable_only=
content://com.android.tv/channel/#/program
content://com.android.tv/channel/#/program?start_time=&end_time=
This allows us to disable user-provided selection on query/delete/update to help
avoid SQL injection.
Bug:
14133838
Change-Id: I6c86ac33cb5bc8aaa5248a80ed0f0fe0899a15b8
Yuling Liang [Mon, 28 Apr 2014 23:22:54 +0000 (23:22 +0000)]
am
3914a33c: am
26a5c2dd: Merge "Followon fix for
14276128 Clipping at bottom of TextView" into klp-modular-dev
* commit '
3914a33c01102f5de51e33d006c0aeedf2693af0':
Followon fix for
14276128 Clipping at bottom of TextView