OSDN Git Service

android-x86/frameworks-base.git
10 years agoMerge "Remove GLRenderer"
John Reck [Tue, 3 Jun 2014 14:27:26 +0000 (14:27 +0000)]
Merge "Remove GLRenderer"

10 years agoam 00e3c58d: am 73f7cd98: Merge "Fix build."
Narayan Kamath [Tue, 3 Jun 2014 14:11:55 +0000 (14:11 +0000)]
am 00e3c58d: am 73f7cd98: Merge "Fix build."

* commit '00e3c58d0232952bdcafd02f71e6c9fb00b4d248':
  Fix build.

10 years agoam 73f7cd98: Merge "Fix build."
Narayan Kamath [Tue, 3 Jun 2014 14:08:51 +0000 (14:08 +0000)]
am 73f7cd98: Merge "Fix build."

* commit '73f7cd98d61eded2cc3af0f672937c7a2ec5c10a':
  Fix build.

10 years agoam dd2e9d33: am 7cb13f8a: Merge "Scan for renderscript files before deciding ABIs."
Narayan Kamath [Tue, 3 Jun 2014 13:58:35 +0000 (13:58 +0000)]
am dd2e9d33: am 7cb13f8a: Merge "Scan for renderscript files before deciding ABIs."

* commit 'dd2e9d3386d2d74f99f79bcad951ff5cdefa6fab':
  Scan for renderscript files before deciding ABIs.

10 years agoam 797b109c: (-s ours) am 7ed98c43: Merge "Add an --abi argument to "pm install""
Narayan Kamath [Tue, 3 Jun 2014 13:58:30 +0000 (13:58 +0000)]
am 797b109c: (-s ours) am 7ed98c43: Merge "Add an --abi argument to "pm install""

* commit '797b109c60bda8e122075b0c2101d3f2a0b67c07':
  Add an --abi argument to "pm install"

10 years agoMerge "Fix build."
Narayan Kamath [Tue, 3 Jun 2014 13:56:03 +0000 (13:56 +0000)]
Merge "Fix build."

10 years agoFix build.
Narayan Kamath [Tue, 3 Jun 2014 13:54:36 +0000 (14:54 +0100)]
Fix build.

Bad resolution of a manual rebase.

Change-Id: I56d4c7a343c8fd7a715f983b2db15767849f9af7

10 years agoam 41aa48be: am 032c5c05: Merge "Log process abis during start."
Narayan Kamath [Tue, 3 Jun 2014 13:29:04 +0000 (13:29 +0000)]
am 41aa48be: am 032c5c05: Merge "Log process abis during start."

* commit '41aa48beacc93a1511a290e91293402eeb787165':
  Log process abis during start.

10 years agoam 7cb13f8a: Merge "Scan for renderscript files before deciding ABIs."
Narayan Kamath [Tue, 3 Jun 2014 13:24:50 +0000 (13:24 +0000)]
am 7cb13f8a: Merge "Scan for renderscript files before deciding ABIs."

* commit '7cb13f8a0a40f3d971a953b330f38bfcfb001c5e':
  Scan for renderscript files before deciding ABIs.

10 years agoam 7ed98c43: Merge "Add an --abi argument to "pm install""
Narayan Kamath [Tue, 3 Jun 2014 13:24:45 +0000 (13:24 +0000)]
am 7ed98c43: Merge "Add an --abi argument to "pm install""

* commit '7ed98c43f8cbcfbb4862205a72455ab39359a011':
  Add an --abi argument to "pm install"

10 years agoam 032c5c05: Merge "Log process abis during start."
Narayan Kamath [Tue, 3 Jun 2014 13:24:34 +0000 (13:24 +0000)]
am 032c5c05: Merge "Log process abis during start."

* commit '032c5c054c331b63f2d45ee9c497ac852faec633':
  Log process abis during start.

10 years agoMerge "Scan for renderscript files before deciding ABIs."
Narayan Kamath [Tue, 3 Jun 2014 12:20:05 +0000 (12:20 +0000)]
Merge "Scan for renderscript files before deciding ABIs."

10 years agoMerge "Add an --abi argument to "pm install""
Narayan Kamath [Tue, 3 Jun 2014 12:01:53 +0000 (12:01 +0000)]
Merge "Add an --abi argument to "pm install""

10 years agoScan for renderscript files before deciding ABIs.
Narayan Kamath [Fri, 16 May 2014 15:45:56 +0000 (16:45 +0100)]
Scan for renderscript files before deciding ABIs.

The presence of ".bc" files in an APK implies
incompatibility with any of the 64 bit ABIs.

bug: 14900093

Change-Id: I66ca339a9a149cb3b7e7b349033d80acdeb4140a

10 years agoMerge "Fix Legacy NetworkInfo API"
Lorenzo Colitti [Tue, 3 Jun 2014 11:58:23 +0000 (11:58 +0000)]
Merge "Fix Legacy NetworkInfo API"

10 years agoMerge "Add an --abi argument to "pm install""
Narayan Kamath [Tue, 3 Jun 2014 11:10:01 +0000 (11:10 +0000)]
Merge "Add an --abi argument to "pm install""

10 years agoFix Legacy NetworkInfo API
Robert Greenwalt [Mon, 2 Jun 2014 22:32:02 +0000 (15:32 -0700)]
Fix Legacy NetworkInfo API

Make the connectivity changed broadcasts send correct NetworkInfos.
Also update the results of getNetwork.

bug:15290306
bug:15191336
bug:14993207
Change-Id: Ie99ad25f3ebb90d18348e7013761b139e7481866

10 years agoMerge "Remove now defunct touch analysis facility"
Adrian Roos [Tue, 3 Jun 2014 10:46:43 +0000 (10:46 +0000)]
Merge "Remove now defunct touch analysis facility"

10 years agoAdd an --abi argument to "pm install"
Narayan Kamath [Thu, 29 May 2014 10:51:59 +0000 (11:51 +0100)]
Add an --abi argument to "pm install"

This allows callers to force an install to a particular
ABI. This is intended only for testing (and CTS) and is
not meant for usage by the installer package.

bug: 14453227

(cherry picked from commit 6431d11cd420536aaa9d93ae510a3151ccc4df1d)

Change-Id: I85d4f8785deea02a6a4d3cb0b05e6ef8bf64826b

10 years agoMerge "Add SystemAudioAction(FromAvr|FromTv)."
Yuncheol Heo [Tue, 3 Jun 2014 10:12:52 +0000 (10:12 +0000)]
Merge "Add SystemAudioAction(FromAvr|FromTv)."

10 years agoAdd an --abi argument to "pm install"
Narayan Kamath [Thu, 29 May 2014 10:51:59 +0000 (11:51 +0100)]
Add an --abi argument to "pm install"

This allows callers to force an install to a particular
ABI. This is intended only for testing (and CTS) and is
not meant for usage by the installer package.

Change-Id: Icb1528c0cd35b1aa9323386cb35ff4aaba374fcb

10 years agoAdd SystemAudioAction(FromAvr|FromTv).
Yuncheol Heo [Tue, 27 May 2014 14:06:01 +0000 (23:06 +0900)]
Add SystemAudioAction(FromAvr|FromTv).

The system audio can be initiated by Tv itself or by AVR through
<Set System Audio Mode> CEC message.

This CL also includes:
- Add HdmiConstants, HdmiUtil class to handle various constants and
  utility functions.
- Add default message dispatcher to all queued actions.
- Add an argument on HdmiControlService.removeAction(class) to prevent
  from removing the caller itself.

Change-Id: I9fd9089bed876f04b58c483879b64edfae94a298

10 years agoMerge "Log process abis during start."
Narayan Kamath [Tue, 3 Jun 2014 09:57:02 +0000 (09:57 +0000)]
Merge "Log process abis during start."

10 years agoFinish migration of backup transport constants
Christopher Tate [Tue, 3 Jun 2014 02:10:54 +0000 (19:10 -0700)]
Finish migration of backup transport constants

...and make sure to fix a couple of lingering Javadoc references.

Bug 15329632

Change-Id: I1de7b53a58940834cd2dae2301fd5f65dbb48ba6

10 years agoMerge "Add full-backup stream API to BackupTransport"
Christopher Tate [Tue, 3 Jun 2014 02:07:01 +0000 (02:07 +0000)]
Merge "Add full-backup stream API to BackupTransport"

10 years agoAdd full-backup stream API to BackupTransport
Christopher Tate [Tue, 3 Jun 2014 01:54:18 +0000 (18:54 -0700)]
Add full-backup stream API to BackupTransport

Also started migrating the definition of transport success/failure constants
into BackupTransport to make them permanent.

The new methods are not yet plumbed in; this is just to allow forward
progress against a proposed stable API.

Bug 15329632

Change-Id: I27472e09b831350c140b9fa548ebda3af334eb1a

10 years agoMerge "Refactor NetworkFactory."
Robert Greenwalt [Tue, 3 Jun 2014 01:11:00 +0000 (01:11 +0000)]
Merge "Refactor NetworkFactory."

10 years agoMerge "Reenable DynamicRotationList for language-switching-aware IMEs"
Yohei Yukawa [Tue, 3 Jun 2014 00:51:31 +0000 (00:51 +0000)]
Merge "Reenable DynamicRotationList for language-switching-aware IMEs"

10 years agoMerge "WifiService and WifiPasspointService hook up"
Yuhao Zheng [Mon, 2 Jun 2014 23:54:11 +0000 (23:54 +0000)]
Merge "WifiService and WifiPasspointService hook up"

10 years agoWifiService and WifiPasspointService hook up
Yuhao Zheng [Sat, 31 May 2014 01:54:55 +0000 (18:54 -0700)]
WifiService and WifiPasspointService hook up

- add a reference to passpoint service in wifi state machine
- break dependency loop at boot phase

Change-Id: I34c0ce55efa5235ebaba1fa6772f559d608ee5ba

10 years agoRemove GLRenderer
John Reck [Fri, 30 May 2014 21:34:03 +0000 (14:34 -0700)]
Remove GLRenderer

Change-Id: I180286417c1a354fc7eb1eadb1884ac6add0795c

10 years agoMerge "Added missing entries in the cec device array"
Jinsuk Kim [Mon, 2 Jun 2014 23:24:55 +0000 (23:24 +0000)]
Merge "Added missing entries in the cec device array"

10 years agoRefactor NetworkFactory.
Robert Greenwalt [Tue, 27 May 2014 20:20:24 +0000 (13:20 -0700)]
Refactor NetworkFactory.

Make NetworkFactory a concrete class and divide responsibilites between it and NetworkAgent.
Factory will track requests and by default give a single connect/disconnect api for ease
of use.  Then NetworkAgent is created and destroyed as needed with very simple logic.

Change-Id: I401c14a6e5466f2fc63b04219b97ff85bb9af291

10 years agoMerge "Rewrite startUsingNetworkFeature for new API"
Robert Greenwalt [Mon, 2 Jun 2014 23:12:29 +0000 (23:12 +0000)]
Merge "Rewrite startUsingNetworkFeature for new API"

10 years agoMerge "Cleanup"
John Reck [Mon, 2 Jun 2014 22:44:49 +0000 (22:44 +0000)]
Merge "Cleanup"

10 years agoCleanup
John Reck [Mon, 2 Jun 2014 22:12:36 +0000 (15:12 -0700)]
Cleanup

Change-Id: Ie366390272724a2c1dfda99b0e85806b7a612744

10 years agoam f3c294df: Merge "Code cleaning" into lmp-preview-dev
Fabrice Di Meglio [Mon, 2 Jun 2014 22:10:36 +0000 (22:10 +0000)]
am f3c294df: Merge "Code cleaning" into lmp-preview-dev

* commit 'f3c294df46bab8f50bead51e70f562778b8c5deb':
  Code cleaning

10 years agoam 8dead81f: Merge "Code cleaning" into lmp-preview-dev
Fabrice Di Meglio [Mon, 2 Jun 2014 22:10:31 +0000 (22:10 +0000)]
am 8dead81f: Merge "Code cleaning" into lmp-preview-dev

* commit '8dead81f3b1548d0d3f84a585b389baf8d415e99':
  Code cleaning

10 years agoam 39317b97: Merge "Compare task userId with userId profiles." into lmp-preview-dev
Craig Mautner [Mon, 2 Jun 2014 22:10:30 +0000 (22:10 +0000)]
am 39317b97: Merge "Compare task userId with userId profiles." into lmp-preview-dev

* commit '39317b9742cf796557583f6678a7443a991414f7':
  Compare task userId with userId profiles.

10 years agoam 357a441e: (-s ours) Merge "DO NOT MERGE: Accomoditing API Review feedback for...
Vinit Deshpande [Mon, 2 Jun 2014 22:10:30 +0000 (22:10 +0000)]
am 357a441e: (-s ours) Merge "DO NOT MERGE: Accomoditing API Review feedback for WifiScanner" into lmp-preview-dev

* commit '357a441e5be26a642238e2fd13e88f35f6e25a65':
  DO NOT MERGE: Accomoditing API Review feedback for WifiScanner

10 years agoam 20d26282: Merge "Update global actions bug report item." into lmp-preview-dev
John Spurlock [Mon, 2 Jun 2014 22:10:29 +0000 (22:10 +0000)]
am 20d26282: Merge "Update global actions bug report item." into lmp-preview-dev

* commit '20d26282b31dcd7f7d258c3878f15b42211b23d0':
  Update global actions bug report item.

10 years agoRemove now defunct touch analysis facility
Adrian Roos [Mon, 2 Jun 2014 15:57:07 +0000 (17:57 +0200)]
Remove now defunct touch analysis facility

Bug: 15381470
Change-Id: I2ab252e4c0122d79c9a78b3df643bfd46a105cf0

10 years agoMerge "Code cleaning" into lmp-preview-dev
Fabrice Di Meglio [Mon, 2 Jun 2014 20:50:42 +0000 (20:50 +0000)]
Merge "Code cleaning" into lmp-preview-dev

10 years agoMerge "Code cleaning" into lmp-preview-dev
Fabrice Di Meglio [Mon, 2 Jun 2014 20:49:37 +0000 (20:49 +0000)]
Merge "Code cleaning" into lmp-preview-dev

10 years agoMerge "Compare task userId with userId profiles." into lmp-preview-dev
Craig Mautner [Mon, 2 Jun 2014 20:40:16 +0000 (20:40 +0000)]
Merge "Compare task userId with userId profiles." into lmp-preview-dev

10 years agoMerge "handle removal of self added configurations"
vandwalle [Mon, 2 Jun 2014 20:03:13 +0000 (20:03 +0000)]
Merge "handle removal of self added configurations"

10 years agoMerge "DO NOT MERGE: Accomoditing API Review feedback for WifiScanner" into lmp-previ...
Vinit Deshpande [Mon, 2 Jun 2014 20:00:12 +0000 (20:00 +0000)]
Merge "DO NOT MERGE: Accomoditing API Review feedback for WifiScanner" into lmp-preview-dev

10 years agoMerge "Update global actions bug report item." into lmp-preview-dev
John Spurlock [Mon, 2 Jun 2014 19:17:35 +0000 (19:17 +0000)]
Merge "Update global actions bug report item." into lmp-preview-dev

10 years agoUpdate global actions bug report item.
John Spurlock [Mon, 2 Jun 2014 18:10:41 +0000 (14:10 -0400)]
Update global actions bug report item.

New icon, update title to match confirm dialog, new status
line for build information.

Remove redundant QS tile.

Bug:15385554
Change-Id: Idc36dc9ce1cabfa61fd8acac56dc3a70d5dc6645

10 years agoMerge "More ANQP parsing"
Yuhao Zheng [Mon, 2 Jun 2014 18:38:45 +0000 (18:38 +0000)]
Merge "More ANQP parsing"

10 years agoam a0183b02: am 8868d129: am 1c725866: Merge "MtpDatabase JNI: Fixed incorrect method...
Mike Lockwood [Mon, 2 Jun 2014 18:32:26 +0000 (18:32 +0000)]
am a0183b02: am 8868d129: am 1c725866: Merge "MtpDatabase JNI: Fixed incorrect method name in ALOGE."

* commit 'a0183b02e4c6f53587519b445a546192b4a20146':
  MtpDatabase JNI: Fixed incorrect method name in ALOGE.

10 years agoam 1ac54ec6: am 750e78bb: am 27eb205e: Merge "MtpDatabase JNI: Fixed a memory-leak...
Mike Lockwood [Mon, 2 Jun 2014 18:32:20 +0000 (18:32 +0000)]
am 1ac54ec6: am 750e78bb: am 27eb205e: Merge "MtpDatabase JNI: Fixed a memory-leak in getObjectPropertyValue()."

* commit '1ac54ec69bfcda2638b05c7daa4300ec5749e7b8':
  MtpDatabase JNI: Fixed a memory-leak in getObjectPropertyValue().

10 years agoam 8868d129: am 1c725866: Merge "MtpDatabase JNI: Fixed incorrect method name in...
Mike Lockwood [Mon, 2 Jun 2014 18:28:51 +0000 (18:28 +0000)]
am 8868d129: am 1c725866: Merge "MtpDatabase JNI: Fixed incorrect method name in ALOGE."

* commit '8868d1290afd96997fef671f4a7a4c7bbf94fa1a':
  MtpDatabase JNI: Fixed incorrect method name in ALOGE.

10 years agoam 750e78bb: am 27eb205e: Merge "MtpDatabase JNI: Fixed a memory-leak in getObjectPro...
Mike Lockwood [Mon, 2 Jun 2014 18:28:42 +0000 (18:28 +0000)]
am 750e78bb: am 27eb205e: Merge "MtpDatabase JNI: Fixed a memory-leak in getObjectPropertyValue()."

* commit '750e78bb7626e2e0d5c8feed4a6e4fbe7fe9b5da':
  MtpDatabase JNI: Fixed a memory-leak in getObjectPropertyValue().

10 years agoam 1c725866: Merge "MtpDatabase JNI: Fixed incorrect method name in ALOGE."
Mike Lockwood [Mon, 2 Jun 2014 18:25:35 +0000 (18:25 +0000)]
am 1c725866: Merge "MtpDatabase JNI: Fixed incorrect method name in ALOGE."

* commit '1c725866da02c3e1f62fb416ea3450caed406f2a':
  MtpDatabase JNI: Fixed incorrect method name in ALOGE.

10 years agoam 27eb205e: Merge "MtpDatabase JNI: Fixed a memory-leak in getObjectPropertyValue()."
Mike Lockwood [Mon, 2 Jun 2014 18:25:28 +0000 (18:25 +0000)]
am 27eb205e: Merge "MtpDatabase JNI: Fixed a memory-leak in getObjectPropertyValue()."

* commit '27eb205e21e7715764084085f382d690e0406c63':
  MtpDatabase JNI: Fixed a memory-leak in getObjectPropertyValue().

10 years agoMerge "MtpDatabase JNI: Fixed incorrect method name in ALOGE."
Mike Lockwood [Mon, 2 Jun 2014 18:21:17 +0000 (18:21 +0000)]
Merge "MtpDatabase JNI: Fixed incorrect method name in ALOGE."

10 years agoMerge "MtpDatabase JNI: Fixed a memory-leak in getObjectPropertyValue()."
Mike Lockwood [Mon, 2 Jun 2014 18:20:39 +0000 (18:20 +0000)]
Merge "MtpDatabase JNI: Fixed a memory-leak in getObjectPropertyValue()."

10 years agoam feccbdc4: Merge "Add setStartValue to RNA" into lmp-preview-dev
John Reck [Mon, 2 Jun 2014 18:19:44 +0000 (18:19 +0000)]
am feccbdc4: Merge "Add setStartValue to RNA" into lmp-preview-dev

* commit 'feccbdc4d0bee3eb4c395bd93ba51cbc6616527a':
  Add setStartValue to RNA

10 years agoMerge "Add setStartValue to RNA" into lmp-preview-dev
John Reck [Mon, 2 Jun 2014 18:13:13 +0000 (18:13 +0000)]
Merge "Add setStartValue to RNA" into lmp-preview-dev

10 years agoam dfc40743: Merge "Revert ascent/descent/lineGap of Roboto to Roboto v1 values"...
Raph Levien [Mon, 2 Jun 2014 18:08:19 +0000 (18:08 +0000)]
am dfc40743: Merge "Revert ascent/descent/lineGap of Roboto to Roboto v1 values" into lmp-preview-dev

* commit 'dfc40743fda406614a2200a31e8a670b7fa46cd8':
  Revert ascent/descent/lineGap of Roboto to Roboto v1 values

10 years agoMerge "Revert ascent/descent/lineGap of Roboto to Roboto v1 values" into lmp-preview-dev
Raph Levien [Mon, 2 Jun 2014 18:04:45 +0000 (18:04 +0000)]
Merge "Revert ascent/descent/lineGap of Roboto to Roboto v1 values" into lmp-preview-dev

10 years agoAdd setStartValue to RNA
John Reck [Mon, 2 Jun 2014 18:00:09 +0000 (11:00 -0700)]
Add setStartValue to RNA

 Bug: 15198607
 Should be good-enough for Ripples to use for pseudo-chaining
 support.

Change-Id: Ia8666928ccb69ae401cb583751632a52bd928b63

10 years agohandle removal of self added configurations
vandwalle [Sun, 1 Jun 2014 21:58:07 +0000 (14:58 -0700)]
handle removal of self added configurations

Change-Id: Ib2891ac38a4a876b0cd4f198cf26198b9fc12909

10 years agoam 2726d500: Merge "Fix keyguard camera logic" into lmp-preview-dev
Adrian Roos [Mon, 2 Jun 2014 17:52:56 +0000 (17:52 +0000)]
am 2726d500: Merge "Fix keyguard camera logic" into lmp-preview-dev

* commit '2726d500c4e6ae63dbc4ee3b070cd2f6ba008602':
  Fix keyguard camera logic

10 years agoMore ANQP parsing
Yuhao Zheng [Wed, 28 May 2014 01:38:55 +0000 (18:38 -0700)]
More ANQP parsing

Change-Id: Ie24eeffa145f2a1bda0cd8e74a52103fdf4b7674

10 years agoMerge "Fix keyguard camera logic" into lmp-preview-dev
Adrian Roos [Mon, 2 Jun 2014 17:48:07 +0000 (17:48 +0000)]
Merge "Fix keyguard camera logic" into lmp-preview-dev

10 years agoam 73d37038: Merge "Fix null paint in GradientDrawable, make default values explicit...
Alan Viverette [Mon, 2 Jun 2014 17:45:04 +0000 (17:45 +0000)]
am 73d37038: Merge "Fix null paint in GradientDrawable, make default values explicit" into lmp-preview-dev

* commit '73d370389338b97f801631182bd9a650b42f9a1b':
  Fix null paint in GradientDrawable, make default values explicit

10 years agoam c710f6da: Merge "Fix default GridView list selector" into lmp-preview-dev
Alan Viverette [Mon, 2 Jun 2014 17:44:59 +0000 (17:44 +0000)]
am c710f6da: Merge "Fix default GridView list selector" into lmp-preview-dev

* commit 'c710f6da778e3bfd26af87b9116ac264e341d007':
  Fix default GridView list selector

10 years agoMerge "Read data from stdin/stdout to follow adb change."
Jeff Sharkey [Mon, 2 Jun 2014 17:44:47 +0000 (17:44 +0000)]
Merge "Read data from stdin/stdout to follow adb change."

10 years agoMerge "Fix null paint in GradientDrawable, make default values explicit" into lmp...
Alan Viverette [Mon, 2 Jun 2014 17:36:50 +0000 (17:36 +0000)]
Merge "Fix null paint in GradientDrawable, make default values explicit" into lmp-preview-dev

10 years agoMerge "Fix default GridView list selector" into lmp-preview-dev
Alan Viverette [Mon, 2 Jun 2014 17:36:00 +0000 (17:36 +0000)]
Merge "Fix default GridView list selector" into lmp-preview-dev

10 years agoMerge "Add ArrayUtils methods and tests for consumption by KeySet code."
dcashman [Mon, 2 Jun 2014 17:34:08 +0000 (17:34 +0000)]
Merge "Add ArrayUtils methods and tests for consumption by KeySet code."

10 years agoFix keyguard camera logic
Adrian Roos [Wed, 28 May 2014 10:13:48 +0000 (12:13 +0200)]
Fix keyguard camera logic

Starts non-secure camera if possible and hides camera if
it is not available.

Bug: 14384051
Change-Id: Ib0b93562bb22eb543c054adaf8f7a211862f480a

10 years agoAdd ArrayUtils methods and tests for consumption by KeySet code.
dcashman [Fri, 30 May 2014 16:34:04 +0000 (09:34 -0700)]
Add ArrayUtils methods and tests for consumption by KeySet code.

Adds methods for dealing specifically with long data types.  Used by
PackageKeySetData as part of the KeySet work.  Add appropriate test methods
to MoreAsserts as well.

Bug: 6967056
Change-Id: I1e263301b353e0cd1b45126be6ef5ec310f311a8

10 years agoam 00eb98bc: Merge "Add necessary APIs to support conference calling." into lmp-previ...
Santos Cordon [Mon, 2 Jun 2014 17:26:42 +0000 (17:26 +0000)]
am 00eb98bc: Merge "Add necessary APIs to support conference calling." into lmp-preview-dev

* commit '00eb98bc93f11df3b869eca32f04f71d44ee4e6d':
  Add necessary APIs to support conference calling.

10 years agoMerge "Add necessary APIs to support conference calling." into lmp-preview-dev
Santos Cordon [Mon, 2 Jun 2014 17:21:03 +0000 (17:21 +0000)]
Merge "Add necessary APIs to support conference calling." into lmp-preview-dev

10 years agoam c7ed6f69: Merge "Minimum work to make volume handling work with sessions" into...
RoboErik [Mon, 2 Jun 2014 17:15:14 +0000 (17:15 +0000)]
am c7ed6f69: Merge "Minimum work to make volume handling work with sessions" into lmp-preview-dev

* commit 'c7ed6f69d474f23df89d36ed94ff0062daa8dcbc':
  Minimum work to make volume handling work with sessions

10 years agoCompare task userId with userId profiles.
Craig Mautner [Mon, 2 Jun 2014 17:11:53 +0000 (10:11 -0700)]
Compare task userId with userId profiles.

Change comparison of Task.mUserId from comparing with only the
current user id to comparing with all current profile user ids.

Fixes bug 14930145.

Change-Id: Ibbae08da6f4eaa31b171becdd8957293758f527b

10 years agoMerge "Minimum work to make volume handling work with sessions" into lmp-preview-dev
RoboErik [Mon, 2 Jun 2014 17:10:07 +0000 (17:10 +0000)]
Merge "Minimum work to make volume handling work with sessions" into lmp-preview-dev

10 years agoam ec3ade5e: am 164ecfaa: am be9bf634: am a68757bb: Merge "docs: Added Sony Mobile...
Andrew Solovay [Mon, 2 Jun 2014 17:07:25 +0000 (17:07 +0000)]
am ec3ade5e: am 164ecfaa: am be9bf634: am a68757bb: Merge "docs: Added Sony Mobile Communications to the USB Vendor ID table." into klp-docs

* commit 'ec3ade5e8e7fffd439f25a53c74f67e63b86c4d2':
  docs: Added Sony Mobile Communications to the USB Vendor ID table.

10 years agoam 164ecfaa: am be9bf634: am a68757bb: Merge "docs: Added Sony Mobile Communications...
Andrew Solovay [Mon, 2 Jun 2014 17:02:52 +0000 (17:02 +0000)]
am 164ecfaa: am be9bf634: am a68757bb: Merge "docs: Added Sony Mobile Communications to the USB Vendor ID table." into klp-docs

* commit '164ecfaa4106952ab77631353d2a94ae13f3c03a':
  docs: Added Sony Mobile Communications to the USB Vendor ID table.

10 years agoam be9bf634: am a68757bb: Merge "docs: Added Sony Mobile Communications to the USB...
Andrew Solovay [Mon, 2 Jun 2014 16:59:43 +0000 (16:59 +0000)]
am be9bf634: am a68757bb: Merge "docs: Added Sony Mobile Communications to the USB Vendor ID table." into klp-docs

* commit 'be9bf6344c45f68314e3de9e8712c86bd3d0b1e8':
  docs: Added Sony Mobile Communications to the USB Vendor ID table.

10 years agoam a68757bb: Merge "docs: Added Sony Mobile Communications to the USB Vendor ID table...
Andrew Solovay [Mon, 2 Jun 2014 16:56:30 +0000 (16:56 +0000)]
am a68757bb: Merge "docs: Added Sony Mobile Communications to the USB Vendor ID table." into klp-docs

* commit 'a68757bb3edfa7b55a349e0b00551a22b6ef9be5':
  docs: Added Sony Mobile Communications to the USB Vendor ID table.

10 years agoMerge "docs: Added Sony Mobile Communications to the USB Vendor ID table." into klp...
Andrew Solovay [Mon, 2 Jun 2014 16:53:46 +0000 (16:53 +0000)]
Merge "docs: Added Sony Mobile Communications to the USB Vendor ID table." into klp-docs

10 years agoam 209fc1ae: AudioManager: do not mandate a looper
Eric Laurent [Mon, 2 Jun 2014 16:49:15 +0000 (16:49 +0000)]
am 209fc1ae: AudioManager: do not mandate a looper

* commit '209fc1ae7abb6965cb4f18bf68ff8c350e9d40d9':
  AudioManager: do not mandate a looper

10 years agoRevert ascent/descent/lineGap of Roboto to Roboto v1 values
Roozbeh Pournader [Sat, 31 May 2014 01:46:42 +0000 (18:46 -0700)]
Revert ascent/descent/lineGap of Roboto to Roboto v1 values

Everything else is left intact to minimize side effects.

Bug: 1530959515330620
Change-Id: I7f10bc093423132b037403aa3abd9304d788f32e

10 years agoMerge "Small fix related to cross-profile result intents."
Nicolas Prevot [Mon, 2 Jun 2014 16:38:01 +0000 (16:38 +0000)]
Merge "Small fix related to cross-profile result intents."

10 years agoAudioManager: do not mandate a looper
Eric Laurent [Mon, 2 Jun 2014 16:16:02 +0000 (09:16 -0700)]
AudioManager: do not mandate a looper

Having a listener for audio port updates is not mandatory.
do not throw an excepion when AudioManager is contructed
from a thread without looper.

Bug: 15368707.
Change-Id: If5ce54bf4efdff8b785098649fa1cd0564861e1e

10 years agoSmall fix related to cross-profile result intents.
Nicolas Prevot [Mon, 2 Jun 2014 14:20:42 +0000 (15:20 +0100)]
Small fix related to cross-profile result intents.

Change-Id: Id99d6406cdd8ceddacf6fee0cf66e7e59d749a15

10 years agoam 56a043ba: Merge "Implement unlock hint." into lmp-preview-dev
Jorim Jaggi [Mon, 2 Jun 2014 13:40:34 +0000 (13:40 +0000)]
am 56a043ba: Merge "Implement unlock hint." into lmp-preview-dev

* commit '56a043ba215b35096769bac402b93e857333b1e4':
  Implement unlock hint.

10 years agoMerge "Add a native Canvas wrapper."
Florin Malita [Mon, 2 Jun 2014 13:37:11 +0000 (13:37 +0000)]
Merge "Add a native Canvas wrapper."

10 years agoMerge "Implement unlock hint." into lmp-preview-dev
Jorim Jaggi [Mon, 2 Jun 2014 13:36:42 +0000 (13:36 +0000)]
Merge "Implement unlock hint." into lmp-preview-dev

10 years agoImplement unlock hint.
Jorim Jaggi [Mon, 2 Jun 2014 12:44:49 +0000 (14:44 +0200)]
Implement unlock hint.

Before, users didn't have any clue how to unlock their phone. Now
they have. Also, a tap now dismisses the notification shade in the
unlocked state.

Bug: 14080971
Bug: 15189435
Bug: 15282191
Bug: 15126962

Change-Id: I779344b043b4415809dd98217b7cb9ff6d57fa3e

10 years agoam 3a981600: (-s ours) Merge "DO NOT MERGE: Start Device Discovery after logical...
Jungshik Jang [Mon, 2 Jun 2014 11:44:18 +0000 (11:44 +0000)]
am 3a981600: (-s ours) Merge "DO NOT MERGE: Start Device Discovery after logical address allocation." into lmp-preview-dev

* commit '3a9816007c30c48568a28ad8c4cc622e7879cec7':
  DO NOT MERGE: Start Device Discovery after logical address allocation.

10 years agoam 072ea747: (-s ours) Merge "DO NOT MERGE: Register HdmiControlService" into lmp...
Jungshik Jang [Mon, 2 Jun 2014 11:44:13 +0000 (11:44 +0000)]
am 072ea747: (-s ours) Merge "DO NOT MERGE: Register HdmiControlService" into lmp-preview-dev

* commit '072ea747d3dc71ed9c9ff3fc1ba9f25cbaa1d447':
  DO NOT MERGE: Register HdmiControlService

10 years agoam 32b52923: (-s ours) Merge "DO NOT MERGE: Stop publishing HdmiCecService, start...
Jungshik Jang [Mon, 2 Jun 2014 11:44:09 +0000 (11:44 +0000)]
am 32b52923: (-s ours) Merge "DO NOT MERGE: Stop publishing HdmiCecService, start publishing HdmiControlService" into lmp-preview-dev

* commit '32b529231a45bef4d3b4b5ffcfc1c4de30f9e10e':
  DO NOT MERGE: Stop publishing HdmiCecService, start publishing HdmiControlService

10 years agoam 3b140c63: (-s ours) Merge "DO NOT MERGE: Do not reply with <Feature Abort> to...
Jungshik Jang [Mon, 2 Jun 2014 11:44:04 +0000 (11:44 +0000)]
am 3b140c63: (-s ours) Merge "DO NOT MERGE: Do not reply with <Feature Abort> to CEC Broadcast message" into lmp-preview-dev

* commit '3b140c63aa991d700cf7a11cfd9653b8d7a9ee65':
  DO NOT MERGE: Do not reply with <Feature Abort> to CEC Broadcast message

10 years agoam 367aea2b: (-s ours) Merge "DO NOT MERGE: Dispatch incoming CEC messages to feature...
Jungshik Jang [Mon, 2 Jun 2014 11:43:59 +0000 (11:43 +0000)]
am 367aea2b: (-s ours) Merge "DO NOT MERGE: Dispatch incoming CEC messages to feature actions" into lmp-preview-dev

* commit '367aea2becf1bb742e09cf1c870f4b357b1b1cae':
  DO NOT MERGE: Dispatch incoming CEC messages to feature actions

10 years agoam df9af422: (-s ours) Merge "DO NOT MERGE: Implement device discovery sequence....
Jungshik Jang [Mon, 2 Jun 2014 11:43:55 +0000 (11:43 +0000)]
am df9af422: (-s ours) Merge "DO NOT MERGE: Implement device discovery sequence." into lmp-preview-dev

* commit 'df9af422055d97d4743e00f789ae1964318a307b':
  DO NOT MERGE: Implement device discovery sequence.