OSDN Git Service

android-x86/frameworks-base.git
10 years agoCamera2: Fix missing capture result callback issue
Zhijun He [Mon, 31 Mar 2014 23:11:33 +0000 (16:11 -0700)]
Camera2: Fix missing capture result callback issue

When configuring output right after submitting some capture request, the
waitUntilIdle clears the capture mCaptureListenerMap and
mRepeatingRequestIdDeletedList. This caused the listener is cleared before
the capture result is delivered to application side. Since the listener is
already removed properly, it is really not needed to clear them right after
idling the device.

It also doesn't make sense to add the repeating request id that has no
listener hooked up to the mRepeatingRequestIdDeletedList, this caused
out of sync between id deleted list and the mCaptureListenerMap for
repeating request.

Bug: 13730119
Change-Id: I94ab7a5515f841ffd97b103c2c1b71d92afd955a

10 years agoam c796ccaa: am 095ece10: am b3cafa56: Merge "Fix RenderScriptGL setSurfaceTexture...
Jason Sams [Tue, 1 Apr 2014 00:24:57 +0000 (00:24 +0000)]
am c796ccaa: am 095ece10: am b3cafa56: Merge "Fix RenderScriptGL setSurfaceTexture problem"

* commit 'c796ccaafb935592b98d5aaad2594791935f6530':
  Fix RenderScriptGL setSurfaceTexture problem

10 years agoam 7471a3b1: am adcb288e: am b1088bfe: Merge "update common intents guide to add...
Scott Main [Tue, 1 Apr 2014 00:24:53 +0000 (00:24 +0000)]
am 7471a3b1: am adcb288e: am b1088bfe: Merge "update common intents guide to add calendar and alarms." into klp-docs

* commit '7471a3b1ea3b722168ed3e932d4015750c913c0b':
  update common intents guide to add calendar and alarms.

10 years agoam ce0854cc: (-s ours) am ee800b04: (-s ours) Merge "Import translations. DO NOT...
Baligh Uddin [Tue, 1 Apr 2014 00:24:50 +0000 (00:24 +0000)]
am ce0854cc: (-s ours) am ee800b04: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev

* commit 'ce0854ccba6adae15cd0b1042e3ad5fb777293da':
  Import translations. DO NOT MERGE

10 years agoam 095ece10: am b3cafa56: Merge "Fix RenderScriptGL setSurfaceTexture problem"
Jason Sams [Tue, 1 Apr 2014 00:15:26 +0000 (00:15 +0000)]
am 095ece10: am b3cafa56: Merge "Fix RenderScriptGL setSurfaceTexture problem"

* commit '095ece10095ecb8c76e3ed4fb0dd1e23a5ced22b':
  Fix RenderScriptGL setSurfaceTexture problem

10 years agoam adcb288e: am b1088bfe: Merge "update common intents guide to add calendar and...
Scott Main [Tue, 1 Apr 2014 00:12:56 +0000 (00:12 +0000)]
am adcb288e: am b1088bfe: Merge "update common intents guide to add calendar and alarms." into klp-docs

* commit 'adcb288e3890381c9961ee32a79df8e9d805a6ad':
  update common intents guide to add calendar and alarms.

10 years agoam ee800b04: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev
Baligh Uddin [Tue, 1 Apr 2014 00:12:47 +0000 (00:12 +0000)]
am ee800b04: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev

* commit 'ee800b04d9ed625db93b1531eec0595838228e2f':
  Import translations. DO NOT MERGE

10 years agoam b3cafa56: Merge "Fix RenderScriptGL setSurfaceTexture problem"
Jason Sams [Tue, 1 Apr 2014 00:10:55 +0000 (00:10 +0000)]
am b3cafa56: Merge "Fix RenderScriptGL setSurfaceTexture problem"

* commit 'b3cafa56205942343930e4fbb0a3d50d6e33a046':
  Fix RenderScriptGL setSurfaceTexture problem

10 years agoam b1088bfe: Merge "update common intents guide to add calendar and alarms." into...
Scott Main [Tue, 1 Apr 2014 00:03:18 +0000 (00:03 +0000)]
am b1088bfe: Merge "update common intents guide to add calendar and alarms." into klp-docs

* commit 'b1088bfe8d321f299d92736102b573963315dc26':
  update common intents guide to add calendar and alarms.

10 years agoFix docs even more
Alan Viverette [Mon, 31 Mar 2014 23:41:07 +0000 (16:41 -0700)]
Fix docs even more

Change-Id: I436615302d24f2f098e2224881c65dbef0d20cfa

10 years agoMerge "Fix docs"
Alan Viverette [Mon, 31 Mar 2014 23:39:11 +0000 (23:39 +0000)]
Merge "Fix docs"

10 years agoFix docs
Alan Viverette [Mon, 31 Mar 2014 23:37:42 +0000 (16:37 -0700)]
Fix docs

Change-Id: I79ee1cccb723f7471b175e1f2fc7ac94d54a526e

10 years agoMerge "Fix RenderScriptGL setSurfaceTexture problem"
Jason Sams [Mon, 31 Mar 2014 23:21:42 +0000 (23:21 +0000)]
Merge "Fix RenderScriptGL setSurfaceTexture problem"

10 years agoMerge "Add missing dependency in layoutlib build file"
Deepanshu Gupta [Mon, 31 Mar 2014 23:14:35 +0000 (23:14 +0000)]
Merge "Add missing dependency in layoutlib build file"

10 years agoAdd missing dependency in layoutlib build file
Deepanshu Gupta [Mon, 31 Mar 2014 23:11:13 +0000 (16:11 -0700)]
Add missing dependency in layoutlib build file

Add missing dependency on built_ext_data

Change-Id: I4e7cca7f6cbc7f5b7416ac9b85a9aec01e61ecd4

10 years agoMerge "AudioTrack and AudioRecord JNI cleanup"
Glenn Kasten [Mon, 31 Mar 2014 23:06:50 +0000 (23:06 +0000)]
Merge "AudioTrack and AudioRecord JNI cleanup"

10 years agoMerge "Switch device default theme over to Quantum"
Alan Viverette [Mon, 31 Mar 2014 22:38:13 +0000 (22:38 +0000)]
Merge "Switch device default theme over to Quantum"

10 years agoMerge "Import translations. DO NOT MERGE" into klp-modular-dev
Baligh Uddin [Mon, 31 Mar 2014 22:11:32 +0000 (22:11 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-modular-dev

10 years agoMerge "Import translations. DO NOT MERGE"
Baligh Uddin [Mon, 31 Mar 2014 22:11:26 +0000 (22:11 +0000)]
Merge "Import translations. DO NOT MERGE"

10 years agoMerge "Import translations. DO NOT MERGE"
Baligh Uddin [Mon, 31 Mar 2014 22:09:53 +0000 (22:09 +0000)]
Merge "Import translations. DO NOT MERGE"

10 years agoSwitch device default theme over to Quantum
Alan Viverette [Mon, 31 Mar 2014 22:01:00 +0000 (15:01 -0700)]
Switch device default theme over to Quantum

Change-Id: I4d8ad0a9d62b898ae34900b4a749e75a975af5af

10 years agoMerge "update common intents guide to add calendar and alarms." into klp-docs
Scott Main [Mon, 31 Mar 2014 21:47:45 +0000 (21:47 +0000)]
Merge "update common intents guide to add calendar and alarms." into klp-docs

10 years agoam 7d394df2: am ae1b763c: Merge "LE: Add API to configure MTU for a given connection...
Zhihai Xu [Mon, 31 Mar 2014 21:35:38 +0000 (21:35 +0000)]
am 7d394df2: am ae1b763c: Merge "LE: Add API to configure MTU for a given connection (3/4)" into klp-modular-dev

* commit '7d394df2ab8f951215a775df8d2bd9e6518e746a':
  LE: Add API to configure MTU for a given connection (3/4)

10 years agoam ae1b763c: Merge "LE: Add API to configure MTU for a given connection (3/4)" into...
Zhihai Xu [Mon, 31 Mar 2014 21:28:47 +0000 (21:28 +0000)]
am ae1b763c: Merge "LE: Add API to configure MTU for a given connection (3/4)" into klp-modular-dev

* commit 'ae1b763cded7e2cb3eec3cbec0680c25e55c109c':
  LE: Add API to configure MTU for a given connection (3/4)

10 years agoMerge "LE: Add API to configure MTU for a given connection (3/4)" into klp-modular-dev
Zhihai Xu [Mon, 31 Mar 2014 21:21:54 +0000 (21:21 +0000)]
Merge "LE: Add API to configure MTU for a given connection (3/4)" into klp-modular-dev

10 years agoam ce30fca8: am e531e2ec: am 3b2a9d22: Merge "Change when the SELinux relabel of...
Nick Kralevich [Mon, 31 Mar 2014 20:26:27 +0000 (20:26 +0000)]
am ce30fca8: am e531e2ec: am 3b2a9d22: Merge "Change when the SELinux relabel of /data/data occurs."

* commit 'ce30fca85deec8e268009a2acaefe85541ab1e58':
  Change when the SELinux relabel of /data/data occurs.

10 years agoam e531e2ec: am 3b2a9d22: Merge "Change when the SELinux relabel of /data/data occurs."
Nick Kralevich [Mon, 31 Mar 2014 20:20:41 +0000 (20:20 +0000)]
am e531e2ec: am 3b2a9d22: Merge "Change when the SELinux relabel of /data/data occurs."

* commit 'e531e2ec6b311c35b077cc228e832b3f1530dffa':
  Change when the SELinux relabel of /data/data occurs.

10 years agoam 3b2a9d22: Merge "Change when the SELinux relabel of /data/data occurs."
Nick Kralevich [Mon, 31 Mar 2014 20:14:37 +0000 (20:14 +0000)]
am 3b2a9d22: Merge "Change when the SELinux relabel of /data/data occurs."

* commit '3b2a9d22794cb9f1c2a28884b5c3ba92ecc6ff96':
  Change when the SELinux relabel of /data/data occurs.

10 years agoMerge "Change when the SELinux relabel of /data/data occurs."
Nick Kralevich [Mon, 31 Mar 2014 20:09:31 +0000 (20:09 +0000)]
Merge "Change when the SELinux relabel of /data/data occurs."

10 years agoMerge "Make the reveal animation API public"
ztenghui [Mon, 31 Mar 2014 20:08:12 +0000 (20:08 +0000)]
Merge "Make the reveal animation API public"

10 years agoam 7156b7c6: am b11952d6: am e3434fc4: Merge "Improve detail message for X509TrustMan...
Brian Carlstrom [Mon, 31 Mar 2014 20:06:06 +0000 (20:06 +0000)]
am 7156b7c6: am b11952d6: am e3434fc4: Merge "Improve detail message for X509TrustManagerExtensions argument validation"

* commit '7156b7c65d6f158c4898a93f8e2cea0bf94791d1':
  Improve detail message for X509TrustManagerExtensions argument validation

10 years agoam b11952d6: am e3434fc4: Merge "Improve detail message for X509TrustManagerExtension...
Brian Carlstrom [Mon, 31 Mar 2014 19:59:31 +0000 (19:59 +0000)]
am b11952d6: am e3434fc4: Merge "Improve detail message for X509TrustManagerExtensions argument validation"

* commit 'b11952d6f6851dbd1da447da967f6e07984942fe':
  Improve detail message for X509TrustManagerExtensions argument validation

10 years agoam e3434fc4: Merge "Improve detail message for X509TrustManagerExtensions argument...
Brian Carlstrom [Mon, 31 Mar 2014 19:55:16 +0000 (19:55 +0000)]
am e3434fc4: Merge "Improve detail message for X509TrustManagerExtensions argument validation"

* commit 'e3434fc4fb164b66e529e675dfc31652a4c69cb5':
  Improve detail message for X509TrustManagerExtensions argument validation

10 years agoam fe710551: (-s ours) am ecaea7e6: Merge "Force refresh of stateful when a child...
Craig Stout [Mon, 31 Mar 2014 19:50:01 +0000 (19:50 +0000)]
am fe710551: (-s ours) am ecaea7e6: Merge "Force refresh of stateful when a child drawable is changed." into klp-modular-dev

* commit 'fe710551cfd98ce90f331e3b9a240d46f303f7b1':
  Force refresh of stateful when a child drawable is changed.

10 years agoMerge "Improve detail message for X509TrustManagerExtensions argument validation"
Brian Carlstrom [Mon, 31 Mar 2014 19:49:34 +0000 (19:49 +0000)]
Merge "Improve detail message for X509TrustManagerExtensions argument validation"

10 years agoMerge "Fix build from multiple declaration"
Glenn Kasten [Mon, 31 Mar 2014 19:28:47 +0000 (19:28 +0000)]
Merge "Fix build from multiple declaration"

10 years agoAdd a SampleTrustAgent
Adrian Roos [Thu, 27 Mar 2014 13:58:41 +0000 (14:58 +0100)]
Add a SampleTrustAgent

Adds a simple app that shows how to build a trust agent. For
lack of a better place to put this, this stays in Keyguard's tests
for now.

Bug: 13723878
Change-Id: I9ebad253d3d89c846fe8afaad6babce9e7b80b5e

10 years agoFix build from multiple declaration
Glenn Kasten [Mon, 31 Mar 2014 19:26:22 +0000 (12:26 -0700)]
Fix build from multiple declaration

Change-Id: Id2dd703aedef0423605407ab7a14ef7b48c2fcdb

10 years agoMake Keyguard trust aware
Adrian Roos [Thu, 27 Mar 2014 13:58:03 +0000 (14:58 +0100)]
Make Keyguard trust aware

Bug: 13723878
Change-Id: If1f54de4112a120848df72192b82e35b341e8ed3

10 years agoMerge "Define trust agent framework components"
Adrian Roos [Mon, 31 Mar 2014 19:21:05 +0000 (19:21 +0000)]
Merge "Define trust agent framework components"

10 years agoDefine trust agent framework components
Adrian Roos [Thu, 27 Mar 2014 13:56:59 +0000 (14:56 +0100)]
Define trust agent framework components

Adds the TrustManager system service that allows
registering for changes to the trust status and
reporting events that are important to trust agents.

Bug: 13723878
Change-Id: I7d0d2ea86fd755702d31aa5d49cac038a6cd4301

10 years agoMerge "Clean up LayerDrawable, ensure cached values are cleared on changes"
Alan Viverette [Mon, 31 Mar 2014 19:13:17 +0000 (19:13 +0000)]
Merge "Clean up LayerDrawable, ensure cached values are cleared on changes"

10 years agoMerge "Remove unthemed drawable cache, since canApplyTheme != isThemed"
Alan Viverette [Mon, 31 Mar 2014 19:12:45 +0000 (19:12 +0000)]
Merge "Remove unthemed drawable cache, since canApplyTheme != isThemed"

10 years agoMerge "Define initial trust agent API"
Adrian Roos [Mon, 31 Mar 2014 19:11:36 +0000 (19:11 +0000)]
Merge "Define initial trust agent API"

10 years agoMerge "Turn on RenderThread"
John Reck [Mon, 31 Mar 2014 19:09:12 +0000 (19:09 +0000)]
Merge "Turn on RenderThread"

10 years agoam ecaea7e6: Merge "Force refresh of stateful when a child drawable is changed."...
Craig Stout [Mon, 31 Mar 2014 19:08:24 +0000 (19:08 +0000)]
am ecaea7e6: Merge "Force refresh of stateful when a child drawable is changed." into klp-modular-dev

* commit 'ecaea7e60c0992ac295163f55c1f986a46eef008':
  Force refresh of stateful when a child drawable is changed.

10 years agoClean up LayerDrawable, ensure cached values are cleared on changes
Alan Viverette [Mon, 31 Mar 2014 19:07:58 +0000 (12:07 -0700)]
Clean up LayerDrawable, ensure cached values are cleared on changes

Change-Id: I9a652475b6ad66379b1298bf53cd5dcb1a1dd37b

10 years agoImport translations. DO NOT MERGE
Baligh Uddin [Mon, 31 Mar 2014 19:05:36 +0000 (12:05 -0700)]
Import translations. DO NOT MERGE

Change-Id: I81bf08f36ce519a1cc397fc3cbb1d92878df54f1
Auto-generated-cl: translation import

10 years agoMerge "Use set() return value instead of separate call to initCheck()"
Glenn Kasten [Mon, 31 Mar 2014 19:03:32 +0000 (19:03 +0000)]
Merge "Use set() return value instead of separate call to initCheck()"

10 years agoMerge "Force refresh of stateful when a child drawable is changed." into klp-modular-dev
Craig Stout [Mon, 31 Mar 2014 19:02:25 +0000 (19:02 +0000)]
Merge "Force refresh of stateful when a child drawable is changed." into klp-modular-dev

10 years agoMerge "add a null check around scrollAdapter access"
Chris Wren [Mon, 31 Mar 2014 18:53:34 +0000 (18:53 +0000)]
Merge "add a null check around scrollAdapter access"

10 years agoadd a null check around scrollAdapter access
Chris Wren [Mon, 31 Mar 2014 17:36:25 +0000 (13:36 -0400)]
add a null check around scrollAdapter access

Bug: 13727213
Change-Id: Ia92c06b66fc4712a758bf813c30f543b08546a80

10 years agoDefine initial trust agent API
Adrian Roos [Fri, 28 Mar 2014 12:02:19 +0000 (13:02 +0100)]
Define initial trust agent API

Adds the minimal API needed to define a useful trust agent.

Bug: 13723878
Change-Id: Ib24440bab7b16d0b656bde8b059e7d42cab2c7dc

10 years agoImport translations. DO NOT MERGE
Baligh Uddin [Mon, 31 Mar 2014 18:37:11 +0000 (11:37 -0700)]
Import translations. DO NOT MERGE

Change-Id: Iaac2af2440931132501062c4eab4ab609fea8857
Auto-generated-cl: translation import

10 years agoImport translations. DO NOT MERGE
Baligh Uddin [Mon, 31 Mar 2014 18:25:46 +0000 (11:25 -0700)]
Import translations. DO NOT MERGE

Change-Id: I873e19f2b3e2e27eb1bc555ef8cc3cc09f2de493
Auto-generated-cl: translation import

10 years agoImprove detail message for X509TrustManagerExtensions argument validation
Brian Carlstrom [Mon, 31 Mar 2014 18:20:51 +0000 (11:20 -0700)]
Improve detail message for X509TrustManagerExtensions argument validation

Bug: 13728564
Change-Id: I03d08babcdc0d11baff5e76a339b4285e92edee8

10 years agoMerge "Include more information in AudioTrack JNI error logs"
Glenn Kasten [Mon, 31 Mar 2014 18:07:42 +0000 (18:07 +0000)]
Merge "Include more information in AudioTrack JNI error logs"

10 years agoMerge "Add invokeFunctor"
John Reck [Mon, 31 Mar 2014 18:04:06 +0000 (18:04 +0000)]
Merge "Add invokeFunctor"

10 years agoMerge "Synchronize channel masks in AudioFormat with system/audio.h"
Glenn Kasten [Mon, 31 Mar 2014 17:58:35 +0000 (17:58 +0000)]
Merge "Synchronize channel masks in AudioFormat with system/audio.h"

10 years agoMake the reveal animation API public
ztenghui [Fri, 28 Mar 2014 20:53:50 +0000 (13:53 -0700)]
Make the reveal animation API public

Change-Id: Iafb17bc768b33b320ffa731a9474be05382126e6

10 years agoInclude more information in AudioTrack JNI error logs
Glenn Kasten [Wed, 28 Nov 2012 22:37:48 +0000 (14:37 -0800)]
Include more information in AudioTrack JNI error logs

Change-Id: I0e57060dd46cce4ec8217bb7d122bd010c974717

10 years agoMerge "Fix warnings"
Glenn Kasten [Mon, 31 Mar 2014 17:19:48 +0000 (17:19 +0000)]
Merge "Fix warnings"

10 years agoTurn on RenderThread
John Reck [Mon, 31 Mar 2014 17:19:14 +0000 (10:19 -0700)]
Turn on RenderThread

Change-Id: I50fd607420baa438eb16b99b1de8604037c11a88

10 years agoMerge "Fix typo"
Glenn Kasten [Mon, 31 Mar 2014 16:53:23 +0000 (16:53 +0000)]
Merge "Fix typo"

10 years agoMerge "Mark the keyguard package as required for profile"
Alexandra Gherghina [Mon, 31 Mar 2014 16:15:48 +0000 (16:15 +0000)]
Merge "Mark the keyguard package as required for profile"

10 years agoMark the keyguard package as required for profile
Alexandra Gherghina [Fri, 28 Mar 2014 11:44:07 +0000 (11:44 +0000)]
Mark the keyguard package as required for profile

Change-Id: I8edae23c57e1f1af2c086c0f67d9d240d3726d84

10 years agoam 56a8f8b4: resolved conflicts for merge of 439145f0 to klp-modular-dev-plus-aosp
Narayan Kamath [Mon, 31 Mar 2014 13:16:16 +0000 (13:16 +0000)]
am 56a8f8b4: resolved conflicts for merge of 439145f0 to klp-modular-dev-plus-aosp

* commit '56a8f8b48ff1d0855209307b9076d6e9b348b59b':
  Don't make isSafeMode a field on the Zygote class.

10 years agoresolved conflicts for merge of 439145f0 to klp-modular-dev-plus-aosp
Narayan Kamath [Mon, 31 Mar 2014 12:54:30 +0000 (13:54 +0100)]
resolved conflicts for merge of 439145f0 to klp-modular-dev-plus-aosp

This isn't a straightforward conflict resolution. This code
has changed significantly. mSafeMode is now a flag on the activity
manager service, and is set when SystemServer calls enterSafeMode.

Change-Id: I1e8ff524566c5e44bb6bf3b138cdebb70004aca3

10 years agoam ab561f5b: Merge "Don\'t make isSafeMode a field on the Zygote class."
Narayan Kamath [Mon, 31 Mar 2014 12:42:14 +0000 (12:42 +0000)]
am ab561f5b: Merge "Don\'t make isSafeMode a field on the Zygote class."

* commit 'ab561f5b4073055c414866ff3dbe8372263474a7':
  Don't make isSafeMode a field on the Zygote class.

10 years agoMerge "Don't make isSafeMode a field on the Zygote class."
Narayan Kamath [Mon, 31 Mar 2014 12:32:49 +0000 (12:32 +0000)]
Merge "Don't make isSafeMode a field on the Zygote class."

10 years agoDon't make isSafeMode a field on the Zygote class.
Narayan Kamath [Fri, 28 Mar 2014 13:10:41 +0000 (13:10 +0000)]
Don't make isSafeMode a field on the Zygote class.

This field is written and read exclusively by the system server,
and should therefore belong to the SystemServer class.

Change-Id: I2708a9a45c0c9cd1a6f563e8cc5844bd8c424bf7

10 years agoNotification usage stats
Christoph Studer [Fri, 14 Mar 2014 11:17:12 +0000 (12:17 +0100)]
Notification usage stats

First cut of gathering implicit notification signals and computing
running stats.

Tracks:
1. Post, update, remove by apps
2. Click, dismissal by users

Stats are aggregated on user, user+pkg, and getKey() levels.

Current stats are printed as part of 'dumpsys notification'.

Change-Id: I06ecbf76e517509895f2f9eea5b9d19bf9a34975

10 years agoam 303d666f: am 0e3f3c70: am 91bbb75c: Merge "Cast CallMethod\'s size_t parameters...
Narayan Kamath [Mon, 31 Mar 2014 09:53:35 +0000 (09:53 +0000)]
am 303d666f: am 0e3f3c70: am 91bbb75c: Merge "Cast CallMethod\'s size_t parameters to jint"

* commit '303d666f2e2b37120e0e9de206ce127e2a532026':
  Cast CallMethod's size_t parameters to jint

10 years agoam 0e3f3c70: am 91bbb75c: Merge "Cast CallMethod\'s size_t parameters to jint"
Narayan Kamath [Mon, 31 Mar 2014 09:48:27 +0000 (09:48 +0000)]
am 0e3f3c70: am 91bbb75c: Merge "Cast CallMethod\'s size_t parameters to jint"

* commit '0e3f3c70226640759d5d705233fbe59f525355bb':
  Cast CallMethod's size_t parameters to jint

10 years agoam 91bbb75c: Merge "Cast CallMethod\'s size_t parameters to jint"
Narayan Kamath [Mon, 31 Mar 2014 09:41:39 +0000 (09:41 +0000)]
am 91bbb75c: Merge "Cast CallMethod\'s size_t parameters to jint"

* commit '91bbb75c75568dee854fb10633f8ce3683265ffd':
  Cast CallMethod's size_t parameters to jint

10 years agoMerge "Cast CallMethod's size_t parameters to jint"
Narayan Kamath [Mon, 31 Mar 2014 09:37:32 +0000 (09:37 +0000)]
Merge "Cast CallMethod's size_t parameters to jint"

10 years agoFix RenderScriptGL setSurfaceTexture problem
Xiaofei Wan [Mon, 31 Mar 2014 06:26:20 +0000 (14:26 +0800)]
Fix RenderScriptGL setSurfaceTexture problem

rsnContextSetSurfaceTexture() has no implementation in rs-jni, use nContextSetSurface() in setSurfaceTexture().

Change-Id: I066432575c9e74f21ea3a3776628b572b6e31377
Signed-off-by: Xiaofei Wan <xiaofei.wan@intel.com>
10 years agoam 2e59bd78: am 41eaa32c: Merge "Replace individual methods with a consolidated CEC...
Jinsuk Kim [Mon, 31 Mar 2014 01:50:56 +0000 (01:50 +0000)]
am 2e59bd78: am 41eaa32c: Merge "Replace individual methods with a consolidated CEC nativeSendmessage" into klp-modular-dev

* commit '2e59bd788546e29e48b85bda72da6af61704113d':
  Replace individual methods with a consolidated CEC nativeSendmessage

10 years agoam 41eaa32c: Merge "Replace individual methods with a consolidated CEC nativeSendmess...
Jinsuk Kim [Mon, 31 Mar 2014 01:44:51 +0000 (01:44 +0000)]
am 41eaa32c: Merge "Replace individual methods with a consolidated CEC nativeSendmessage" into klp-modular-dev

* commit '41eaa32c100d8a903daa7b7d09d34887a3e45ffd':
  Replace individual methods with a consolidated CEC nativeSendmessage

10 years agoMerge "Replace individual methods with a consolidated CEC nativeSendmessage" into...
Jinsuk Kim [Mon, 31 Mar 2014 01:40:30 +0000 (01:40 +0000)]
Merge "Replace individual methods with a consolidated CEC nativeSendmessage" into klp-modular-dev

10 years agoam 80b4e098: am 44b43a51: am 1e4cad81: Merge "GlobalActions: Fix Airplane Mode on...
Wink Saville [Sun, 30 Mar 2014 15:23:30 +0000 (15:23 +0000)]
am 80b4e098: am 44b43a51: am 1e4cad81: Merge "GlobalActions: Fix Airplane Mode on/off issue"

* commit '80b4e09849048a78e08911eff9907cae618eba35':
  GlobalActions: Fix Airplane Mode on/off issue

10 years agoam 44b43a51: am 1e4cad81: Merge "GlobalActions: Fix Airplane Mode on/off issue"
Wink Saville [Sun, 30 Mar 2014 15:17:38 +0000 (15:17 +0000)]
am 44b43a51: am 1e4cad81: Merge "GlobalActions: Fix Airplane Mode on/off issue"

* commit '44b43a51c7d7e5c2cbe1d9912ee4a21686fa1a58':
  GlobalActions: Fix Airplane Mode on/off issue

10 years agoam 1e4cad81: Merge "GlobalActions: Fix Airplane Mode on/off issue"
Wink Saville [Sun, 30 Mar 2014 15:11:27 +0000 (15:11 +0000)]
am 1e4cad81: Merge "GlobalActions: Fix Airplane Mode on/off issue"

* commit '1e4cad8198056a5e27a7aeb104ceb8ada331eafe':
  GlobalActions: Fix Airplane Mode on/off issue

10 years agoMerge "GlobalActions: Fix Airplane Mode on/off issue"
Wink Saville [Sun, 30 Mar 2014 00:15:22 +0000 (00:15 +0000)]
Merge "GlobalActions: Fix Airplane Mode on/off issue"

10 years agoAdd invokeFunctor
John Reck [Sat, 29 Mar 2014 03:30:27 +0000 (20:30 -0700)]
Add invokeFunctor

Change-Id: I09e675d3e02e3e528642175ada00b2b17fab7652

10 years agoam 1b09c97d: am 4447405d: Merge "Callback on correct method when status is unsuccessf...
Wei Wang [Sat, 29 Mar 2014 02:03:03 +0000 (02:03 +0000)]
am 1b09c97d: am 4447405d: Merge "Callback on correct method when status is unsuccessful." into klp-modular-dev

* commit '1b09c97d8a7156a9f35ebab3c98db7b103852a58':
  Callback on correct method when status is unsuccessful.

10 years agoam 4447405d: Merge "Callback on correct method when status is unsuccessful." into...
Wei Wang [Sat, 29 Mar 2014 01:57:31 +0000 (01:57 +0000)]
am 4447405d: Merge "Callback on correct method when status is unsuccessful." into klp-modular-dev

* commit '4447405d76b5a9152aacadbfdefd1f8fd60a03ad':
  Callback on correct method when status is unsuccessful.

10 years agoMerge "Callback on correct method when status is unsuccessful." into klp-modular-dev
Wei Wang [Sat, 29 Mar 2014 01:53:33 +0000 (01:53 +0000)]
Merge "Callback on correct method when status is unsuccessful." into klp-modular-dev

10 years agoCallback on correct method when status is unsuccessful.
Wei Wang [Sat, 29 Mar 2014 01:40:29 +0000 (18:40 -0700)]
Callback on correct method when status is unsuccessful.

Change-Id: I63c07bbae559765af1aecb492379ab18268336d8

10 years agoMerge "Remove kStatusInvoke & kStatusDraw"
John Reck [Sat, 29 Mar 2014 01:41:50 +0000 (01:41 +0000)]
Merge "Remove kStatusInvoke & kStatusDraw"

10 years agoMerge "Remove DisplayList.java"
John Reck [Sat, 29 Mar 2014 01:41:43 +0000 (01:41 +0000)]
Merge "Remove DisplayList.java"

10 years agoMerge "Update several stale RenderNode variable names"
Chris Craik [Sat, 29 Mar 2014 01:39:56 +0000 (01:39 +0000)]
Merge "Update several stale RenderNode variable names"

10 years agoUpdate several stale RenderNode variable names
Chris Craik [Sat, 29 Mar 2014 01:12:12 +0000 (18:12 -0700)]
Update several stale RenderNode variable names

Change-Id: I61c8c66f5a79e3a89ae0d3cffbfd351c05bd6a2b

10 years agoam 5d7db503: am e9eb58c9: Merge "Add InputDevice#supportsSource(int)." into klp-modul...
Michael Wright [Sat, 29 Mar 2014 01:09:30 +0000 (01:09 +0000)]
am 5d7db503: am e9eb58c9: Merge "Add InputDevice#supportsSource(int)." into klp-modular-dev

* commit '5d7db503bd779fb712391174a2b12327a0f9ec51':
  Add InputDevice#supportsSource(int).

10 years agoam 4669cfff: (-s ours) am d020fd33: Merge changes Ib18c99b9,I9f42eeb9 into klp-modula...
Michael Wright [Sat, 29 Mar 2014 01:09:27 +0000 (01:09 +0000)]
am 4669cfff: (-s ours) am d020fd33: Merge changes Ib18c99b9,I9f42eeb9 into klp-modular-dev

* commit '4669cfff1ed590087eade846aee8b4ef58f31739':
  Generate and respect ACTION_CANCEL for joystick fallbacks. DO NOT MERGE
  Adds API for determining confirm and cancel keys.

10 years agoam e9eb58c9: Merge "Add InputDevice#supportsSource(int)." into klp-modular-dev
Michael Wright [Sat, 29 Mar 2014 00:59:49 +0000 (00:59 +0000)]
am e9eb58c9: Merge "Add InputDevice#supportsSource(int)." into klp-modular-dev

* commit 'e9eb58c9a0f48f1ea3afa60f01cfab1f539e5d8e':
  Add InputDevice#supportsSource(int).

10 years agoam d020fd33: Merge changes Ib18c99b9,I9f42eeb9 into klp-modular-dev
Michael Wright [Sat, 29 Mar 2014 00:59:46 +0000 (00:59 +0000)]
am d020fd33: Merge changes Ib18c99b9,I9f42eeb9 into klp-modular-dev

* commit 'd020fd33d147c88a9cda4976d2fa559e55b4ab03':
  Generate and respect ACTION_CANCEL for joystick fallbacks. DO NOT MERGE
  Adds API for determining confirm and cancel keys.

10 years agoMerge "Add InputDevice#supportsSource(int)." into klp-modular-dev
Michael Wright [Sat, 29 Mar 2014 00:56:17 +0000 (00:56 +0000)]
Merge "Add InputDevice#supportsSource(int)." into klp-modular-dev

10 years agoMerge changes Ib18c99b9,I9f42eeb9 into klp-modular-dev
Michael Wright [Sat, 29 Mar 2014 00:56:00 +0000 (00:56 +0000)]
Merge changes Ib18c99b9,I9f42eeb9 into klp-modular-dev

* changes:
  Generate and respect ACTION_CANCEL for joystick fallbacks. DO NOT MERGE
  Adds API for determining confirm and cancel keys.

10 years agoMerge "Simplify RenderNode refresh/build/update process"
Chris Craik [Sat, 29 Mar 2014 00:07:07 +0000 (00:07 +0000)]
Merge "Simplify RenderNode refresh/build/update process"