OSDN Git Service

android-x86/frameworks-base.git
9 years agoCorrect "Sign-in" and "Sign into" to "Sign in to".
Paul Jensen [Fri, 27 Feb 2015 16:07:19 +0000 (11:07 -0500)]
Correct "Sign-in" and "Sign into" to "Sign in to".

bug:19416574
Change-Id: I55cedd2a3e1c1c3192ece860f37c82a55cb6d7c0

9 years agoMerge "Refactor NetworkUtils interaction with DHCP." into m-wireless-dev
Erik Kline [Tue, 3 Mar 2015 06:34:06 +0000 (06:34 +0000)]
Merge "Refactor NetworkUtils interaction with DHCP." into m-wireless-dev

9 years agoam bcced5b8: Merge "Fix incorrect condition for sub id check." into lmp-mr1-dev
Shishir Agrawal [Tue, 3 Mar 2015 03:11:47 +0000 (03:11 +0000)]
am bcced5b8: Merge "Fix incorrect condition for sub id check." into lmp-mr1-dev
automerge: 4322c8d

* commit '4322c8d54ef935a3224c8fcbf7ab55ac48f34f1b':
  Fix incorrect condition for sub id check.

9 years agoam bcced5b8: Merge "Fix incorrect condition for sub id check." into lmp-mr1-dev
Shishir Agrawal [Tue, 3 Mar 2015 02:54:12 +0000 (02:54 +0000)]
am bcced5b8: Merge "Fix incorrect condition for sub id check." into lmp-mr1-dev

* commit 'bcced5b834e49bf3a0b57a0009958ba061d31e76':
  Fix incorrect condition for sub id check.

9 years agoMerge "Fix incorrect condition for sub id check." into lmp-mr1-dev
Shishir Agrawal [Mon, 2 Mar 2015 22:32:16 +0000 (22:32 +0000)]
Merge "Fix incorrect condition for sub id check." into lmp-mr1-dev

9 years agoam f2c1c096: am 6ed9b75a: am 72d75f8d: Merge "Correct PorterDuff filters." into lmp-dev
Deepanshu Gupta [Mon, 2 Mar 2015 22:26:09 +0000 (22:26 +0000)]
am f2c1c096: am 6ed9b75a: am 72d75f8d: Merge "Correct PorterDuff filters." into lmp-dev
automerge: 2b24d07

* commit '2b24d07a87513f3c547a5c279b9b3b5160cec7f0':
  Correct PorterDuff filters.

9 years agoam 2022b0ff: am d003e813: am 369ad57b: Merge "Fix codestyle for switch statements...
Deepanshu Gupta [Mon, 2 Mar 2015 22:24:28 +0000 (22:24 +0000)]
am 2022b0ff: am d003e813: am 369ad57b: Merge "Fix codestyle for switch statements." into lmp-dev
automerge: 5e84b29

* commit '5e84b292337ec48f0c8a40c137a57b4668470c85':
  Fix codestyle for switch statements.

9 years agoam aff0ec93: am 81449b2c: am 10d620ff: Merge "Better error msg for StateList/Hexadeci...
Deepanshu Gupta [Mon, 2 Mar 2015 22:21:35 +0000 (22:21 +0000)]
am aff0ec93: am 81449b2c: am 10d620ff: Merge "Better error msg for StateList/Hexadecimal Color." into lmp-dev
automerge: ab02793

* commit 'ab027932d091932808f8fcc45f3b18fe5b3a6108':
  Better error msg for StateList/Hexadecimal Color.

9 years agoUpdate API.
Etan Cohen [Mon, 2 Mar 2015 19:42:12 +0000 (11:42 -0800)]
Update API.

Change-Id: Ia60cdb94cb929f8ffb37424328eb96cef5743d7f

9 years agoAdd frameworks classes and methods necessary for VVM syncadapter structure.
Nancy Chen [Thu, 12 Feb 2015 17:44:41 +0000 (09:44 -0800)]
Add frameworks classes and methods necessary for VVM syncadapter structure.

+ VvmSyncService is the base class for all visual voicemail sync
services that run the visual voicemail sync adapter. This class handles
writing to the voicemail provider and receiving changes from the
voicemail provider.
+ AuthenticatorService is a stub class for visual voicemail sync
adapters that do not use an Account (all sync adapters must have an
account associated with them, so a stub account is necessary).
+ Voicemail parcelable object to pass voicemail data around easier. This
is mostly copied from VoicemailProviderDemo
+ Extra helper methods in VoicemailContract to help insert and delete
from the voicemail provider.
+ Add multi-sim fields to VoicemailContract.Voicemails

Bug: 19236241
Change-Id: I603e3e5908704cd043e46221680d8bb600ed2cf4

9 years agoAdd PHONE_ACCOUNT_ADDRESS to the call log DB.
Santos Cordon [Thu, 12 Feb 2015 06:57:14 +0000 (22:57 -0800)]
Add PHONE_ACCOUNT_ADDRESS to the call log DB.

Also update some javadoc comments.

Change-Id: If0f8fa0148b3aed74ed434b1017a279ce29b3842

9 years agoRevert "Add PHONE_ACCOUNT_ADDRESS to the call log DB."
Santos Cordon [Tue, 17 Feb 2015 17:16:39 +0000 (17:16 +0000)]
Revert "Add PHONE_ACCOUNT_ADDRESS to the call log DB."

This reverts commit 87bfb3576f6b76fa9838775e302ca0d74fc0071b.

Change-Id: I8e7056dbd3068b915fecff13128a45bb6e99c073

9 years agoAdd PHONE_ACCOUNT_ADDRESS to the call log DB.
Santos Cordon [Thu, 12 Feb 2015 06:57:14 +0000 (22:57 -0800)]
Add PHONE_ACCOUNT_ADDRESS to the call log DB.

Also update some javadoc comments.

Change-Id: I018dac4c92b00ecaf2f675623b924776e7698c55

9 years agoChanged package name of a Telecom service
Ihab Awad [Sat, 7 Feb 2015 01:01:49 +0000 (17:01 -0800)]
Changed package name of a Telecom service

Change-Id: Ib8d5b73a3cdb2aa353c586dccf423a8917a393d6

9 years agoSmall update to PhoneAccountHandle ID javadoc.
Santos Cordon [Tue, 10 Feb 2015 11:38:31 +0000 (03:38 -0800)]
Small update to PhoneAccountHandle ID javadoc.

Change-Id: I31832347689e1e9291cd6b9c100918668fa4b056

9 years agoMerge "Add multi-SIM fields to VoicemailContract.Status." into m-wireless-dev
Etan Cohen [Mon, 2 Mar 2015 20:18:34 +0000 (20:18 +0000)]
Merge "Add multi-SIM fields to VoicemailContract.Status." into m-wireless-dev

9 years agoMerge "Add Sub-ID-from-phone-account converter method." into m-wireless-dev
Etan Cohen [Mon, 2 Mar 2015 20:18:25 +0000 (20:18 +0000)]
Merge "Add Sub-ID-from-phone-account converter method." into m-wireless-dev

9 years agoMerge "Unhide and rename PhoneNumberUtils tts methods" into m-wireless-dev
Etan Cohen [Mon, 2 Mar 2015 20:18:16 +0000 (20:18 +0000)]
Merge "Unhide and rename PhoneNumberUtils tts methods" into m-wireless-dev

9 years agoMerge "Unhide telecom APIs needed by Contacts" into m-wireless-dev
Etan Cohen [Mon, 2 Mar 2015 20:18:06 +0000 (20:18 +0000)]
Merge "Unhide telecom APIs needed by Contacts" into m-wireless-dev

9 years agoam f2c1c096: am 6ed9b75a: am 72d75f8d: Merge "Correct PorterDuff filters." into lmp-dev
Deepanshu Gupta [Mon, 2 Mar 2015 19:57:33 +0000 (19:57 +0000)]
am f2c1c096: am 6ed9b75a: am 72d75f8d: Merge "Correct PorterDuff filters." into lmp-dev

* commit 'f2c1c09683a5cfa23e8394fe5a10e84803f4168b':
  Correct PorterDuff filters.

9 years agoam 2022b0ff: am d003e813: am 369ad57b: Merge "Fix codestyle for switch statements...
Deepanshu Gupta [Mon, 2 Mar 2015 19:57:29 +0000 (19:57 +0000)]
am 2022b0ff: am d003e813: am 369ad57b: Merge "Fix codestyle for switch statements." into lmp-dev

* commit '2022b0ffdd7c91e8435bc204ad9aedd658254166':
  Fix codestyle for switch statements.

9 years agoam aff0ec93: am 81449b2c: am 10d620ff: Merge "Better error msg for StateList/Hexadeci...
Deepanshu Gupta [Mon, 2 Mar 2015 19:57:25 +0000 (19:57 +0000)]
am aff0ec93: am 81449b2c: am 10d620ff: Merge "Better error msg for StateList/Hexadecimal Color." into lmp-dev

* commit 'aff0ec93f2a734a68673f1f7337533b6d93cb256':
  Better error msg for StateList/Hexadecimal Color.

9 years agoam 6ed9b75a: am 72d75f8d: Merge "Correct PorterDuff filters." into lmp-dev
Deepanshu Gupta [Mon, 2 Mar 2015 19:52:33 +0000 (19:52 +0000)]
am 6ed9b75a: am 72d75f8d: Merge "Correct PorterDuff filters." into lmp-dev

* commit '6ed9b75a45ec4bc62b4a0fac2c86479d61918863':
  Correct PorterDuff filters.

9 years agoam d003e813: am 369ad57b: Merge "Fix codestyle for switch statements." into lmp-dev
Deepanshu Gupta [Mon, 2 Mar 2015 19:52:29 +0000 (19:52 +0000)]
am d003e813: am 369ad57b: Merge "Fix codestyle for switch statements." into lmp-dev

* commit 'd003e8133167f2b6741f8eb925fdc9f77c2800a5':
  Fix codestyle for switch statements.

9 years agoam 81449b2c: am 10d620ff: Merge "Better error msg for StateList/Hexadecimal Color...
Deepanshu Gupta [Mon, 2 Mar 2015 19:52:25 +0000 (19:52 +0000)]
am 81449b2c: am 10d620ff: Merge "Better error msg for StateList/Hexadecimal Color." into lmp-dev

* commit '81449b2c4a63392bff22d77f331f4db52011884b':
  Better error msg for StateList/Hexadecimal Color.

9 years agoam 72d75f8d: Merge "Correct PorterDuff filters." into lmp-dev
Deepanshu Gupta [Mon, 2 Mar 2015 19:44:51 +0000 (19:44 +0000)]
am 72d75f8d: Merge "Correct PorterDuff filters." into lmp-dev

* commit '72d75f8d9fb46c04f0458e1f36b064e2b8c3de71':
  Correct PorterDuff filters.

9 years agoam 369ad57b: Merge "Fix codestyle for switch statements." into lmp-dev
Deepanshu Gupta [Mon, 2 Mar 2015 19:44:47 +0000 (19:44 +0000)]
am 369ad57b: Merge "Fix codestyle for switch statements." into lmp-dev

* commit '369ad57b00f1c94c80f0f80ef2e7063a23a94a84':
  Fix codestyle for switch statements.

9 years agoam 10d620ff: Merge "Better error msg for StateList/Hexadecimal Color." into lmp-dev
Deepanshu Gupta [Mon, 2 Mar 2015 19:44:43 +0000 (19:44 +0000)]
am 10d620ff: Merge "Better error msg for StateList/Hexadecimal Color." into lmp-dev

* commit '10d620ff2c4770e926b693e833105e8dbbd5fa86':
  Better error msg for StateList/Hexadecimal Color.

9 years agoMerge "Correct PorterDuff filters." into lmp-dev
Deepanshu Gupta [Mon, 2 Mar 2015 19:40:12 +0000 (19:40 +0000)]
Merge "Correct PorterDuff filters." into lmp-dev

9 years agoMerge "Fix codestyle for switch statements." into lmp-dev
Deepanshu Gupta [Mon, 2 Mar 2015 19:37:30 +0000 (19:37 +0000)]
Merge "Fix codestyle for switch statements." into lmp-dev

9 years agoMerge "Better error msg for StateList/Hexadecimal Color." into lmp-dev
Deepanshu Gupta [Mon, 2 Mar 2015 19:36:57 +0000 (19:36 +0000)]
Merge "Better error msg for StateList/Hexadecimal Color." into lmp-dev

9 years agoam 07d453fa: Merge "Add status bar time for 5.1" into lmp-mr1-dev
Deepanshu Gupta [Mon, 2 Mar 2015 19:32:26 +0000 (19:32 +0000)]
am 07d453fa: Merge "Add status bar time for 5.1" into lmp-mr1-dev

* commit '07d453fa091ab407864d474f9bf2a5167686010a':
  Add status bar time for 5.1

9 years agoMerge "Add status bar time for 5.1" into lmp-mr1-dev
Deepanshu Gupta [Mon, 2 Mar 2015 19:26:14 +0000 (19:26 +0000)]
Merge "Add status bar time for 5.1" into lmp-mr1-dev

9 years agoAdd multi-SIM fields to VoicemailContract.Status.
Nancy Chen [Mon, 2 Feb 2015 22:37:24 +0000 (14:37 -0800)]
Add multi-SIM fields to VoicemailContract.Status.

In order to support multi-SIM visual voicemail, we need to record the
appropriate phone account in the VoicemailContract.Status table.

Bug: 19236241
Change-Id: I89742ab0aa7780de5cd525731685279ff5024c5e

9 years agoAdd Sub-ID-from-phone-account converter method.
Santos Cordon [Tue, 3 Feb 2015 18:57:16 +0000 (10:57 -0800)]
Add Sub-ID-from-phone-account converter method.

There are several places in the code that currently attempt to parse the
sub ID directly from the phone account which is undesireable.  Before we
can change from using the subID to using an ICC ID with the phone
accounts, we need to create a conversion method so that no other
components are parsing the sub ID out of the phone account directly.

Change-Id: I74547fe0807da2fe13f3ff4422cd1d0a7a20d04c

9 years agoam 8243b74f: am 6a0c8084: am 9b94a539: am 97a1173b: docs: March 2015 Dashboard update
Joe Fernandez [Mon, 2 Mar 2015 18:14:24 +0000 (18:14 +0000)]
am 8243b74f: am 6a0c8084: am 9b94a539: am 97a1173b: docs: March 2015 Dashboard update

* commit '8243b74f7f19d57455f7ff9188f539d0361139db':
  docs: March 2015 Dashboard update

9 years agoam 6a0c8084: am 9b94a539: am 97a1173b: docs: March 2015 Dashboard update
Joe Fernandez [Mon, 2 Mar 2015 18:04:39 +0000 (18:04 +0000)]
am 6a0c8084: am 9b94a539: am 97a1173b: docs: March 2015 Dashboard update

* commit '6a0c808487392f6cd8d62ad4abb51c0f077ace0f':
  docs: March 2015 Dashboard update

9 years agoam 9b94a539: am 97a1173b: docs: March 2015 Dashboard update
Joe Fernandez [Mon, 2 Mar 2015 17:14:51 +0000 (17:14 +0000)]
am 9b94a539: am 97a1173b: docs: March 2015 Dashboard update

* commit '9b94a5399845efc9d52ebf37e8fde320885c07c8':
  docs: March 2015 Dashboard update

9 years agoam 97a1173b: docs: March 2015 Dashboard update
Joe Fernandez [Mon, 2 Mar 2015 17:09:01 +0000 (17:09 +0000)]
am 97a1173b: docs: March 2015 Dashboard update

* commit '97a1173b63be900ab5aed694e8022c60f3817fa0':
  docs: March 2015 Dashboard update

9 years agodocs: March 2015 Dashboard update
Joe Fernandez [Mon, 2 Mar 2015 16:53:54 +0000 (08:53 -0800)]
docs: March 2015 Dashboard update

Change-Id: Icaf390b6e55c216c45730190ab31bec7b746e361

9 years agoUnhide and rename PhoneNumberUtils tts methods
Brian Attwell [Wed, 4 Feb 2015 18:38:12 +0000 (10:38 -0800)]
Unhide and rename PhoneNumberUtils tts methods

Renamed ttsSpanAsPhoneNumber #1 -> getPhoneTtsSpan
Renamed ttsSpanAsPhoneNumber #2 -> addPhoneTtsSpan

Instead of removing the original hidden methods, I deprecated them.
Since Telephony changes initially get checked into wireless-dev
branch and dialer/contacts changes get checked into master branch,
immediately deleting the ttsSpanAsPhoneNumber methods would break
builds.

In ContactsCommon, I plan on removing
ContactDisplayUtils#getTelephoneTtsSpannable and instead using
these Telephony APIs. Numbers I tested worked in ToT master talkback:
911, (650) 215 3111, 22222222222, 333-3333, 013334612234, +1 905 471 8484,
001 39 02 444 4444. The changes in this diff cause the numbers
to be talked-back at least as well as before.

Some context: go/question-about-telephonys-ttsspan

Bug: 18777272
Change-Id: I3a6ead3ee9c030761bde903cf88f4aa4fc7a3460

9 years agoUnhide telecom APIs needed by Contacts
Brian Attwell [Fri, 19 Dec 2014 19:37:16 +0000 (11:37 -0800)]
Unhide telecom APIs needed by Contacts

* Removed @SystemApi and @hide from some telecom classes
  and APIs
* Stopped using explicit @link's to ConnectionService, so
  that I didn't need to unhide ConnectionService
* Added @SystemApi to hidden methods inside classes that
  I removed @SystemApi from.
* Ran update-api. This picked up unrelated Math changes
  from b/11388705.

Unbundling

Bug: 18777272
Bug: 11388705
Change-Id: I218e0c3c0ae515d3deb2d3b67657db45a0bad999

9 years agoRefactor NetworkUtils interaction with DHCP.
Erik Kline [Thu, 19 Feb 2015 10:51:15 +0000 (19:51 +0900)]
Refactor NetworkUtils interaction with DHCP.

Separate out starting DHCP (DISCOVER) and RENEW operations from fetching
the results.  Add NetworkUtils.getDhcpResults(), to enable quick checks
of any available DhcpResults without extraneous interaction with the
DHCP daemon.

Bug: 19422416
Change-Id: I58808e529dda8429737e749f5caef56d923c0809

9 years agoam 37f207e1: am 191131d4: am 50e8b020: am a83f6445: Merge "docs: gradle plugin versio...
Rich Slogar [Fri, 27 Feb 2015 23:13:24 +0000 (23:13 +0000)]
am 37f207e1: am 191131d4: am 50e8b020: am a83f6445: Merge "docs: gradle plugin version update" into lmp-docs

* commit '37f207e118f1de7442a8874f7ebc6db643d0edcc':
  docs: gradle plugin version update

9 years agoam 191131d4: am 50e8b020: am a83f6445: Merge "docs: gradle plugin version update...
Rich Slogar [Fri, 27 Feb 2015 22:50:34 +0000 (22:50 +0000)]
am 191131d4: am 50e8b020: am a83f6445: Merge "docs: gradle plugin version update" into lmp-docs

* commit '191131d4494f0b6c51463ae9e771672bad5c970a':
  docs: gradle plugin version update

9 years agoam 50e8b020: am a83f6445: Merge "docs: gradle plugin version update" into lmp-docs
Rich Slogar [Fri, 27 Feb 2015 22:43:42 +0000 (22:43 +0000)]
am 50e8b020: am a83f6445: Merge "docs: gradle plugin version update" into lmp-docs

* commit '50e8b020f69687f11a0abce4ec5312697f9a1449':
  docs: gradle plugin version update

9 years agoam a83f6445: Merge "docs: gradle plugin version update" into lmp-docs
Rich Slogar [Fri, 27 Feb 2015 22:37:17 +0000 (22:37 +0000)]
am a83f6445: Merge "docs: gradle plugin version update" into lmp-docs

* commit 'a83f64451d55882366491e66c7479f194e0625ea':
  docs: gradle plugin version update

9 years agoMerge "docs: gradle plugin version update" into lmp-docs
Rich Slogar [Fri, 27 Feb 2015 22:31:32 +0000 (22:31 +0000)]
Merge "docs: gradle plugin version update" into lmp-docs

9 years agodocs: gradle plugin version update
Rich Slogar [Mon, 23 Feb 2015 18:22:22 +0000 (10:22 -0800)]
docs: gradle plugin version update

b.android 153270

Change-Id: I0c752fdf28181c50924a1ca946b5110f773659dc

9 years agoam dedba01a: am d57871e0: am 8aa8960e: am a464d409: Merge "docs: Add steps to enable...
Luan Nguyen [Fri, 27 Feb 2015 17:00:25 +0000 (17:00 +0000)]
am dedba01a: am d57871e0: am 8aa8960e: am a464d409: Merge "docs: Add steps to enable adb debugging on Wear device" into lmp-docs

* commit 'dedba01ac8b85d535171a910aa6b72ea9ce4498c':
  docs: Add steps to enable adb debugging on Wear device

9 years agoam d4cdf18e: am b8593133: am c1120b45: am 8f0e9c75: Merge "doc: Add Japanese version...
Ryosuke Matsuuchi [Fri, 27 Feb 2015 17:00:20 +0000 (17:00 +0000)]
am d4cdf18e: am b8593133: am c1120b45: am 8f0e9c75: Merge "doc: Add Japanese version of DAC/distribute/ page." into lmp-docs

* commit 'd4cdf18e1c763c2aaedbb4f0cab3657db2adc097':
  doc: Add Japanese version of DAC/distribute/ page.

9 years agoam 3a5b0815: am 3daee377: am 7f26f2b9: am b5e00e5c: docs: Documented new IABv5 sub...
Andrew Solovay [Fri, 27 Feb 2015 17:00:16 +0000 (17:00 +0000)]
am 3a5b0815: am 3daee377: am 7f26f2b9: am b5e00e5c: docs: Documented new IABv5 sub upgrade/downgrade and manual renewal

* commit '3a5b08153e432b79e40bc5ddd62db2bb5fcf71e9':
  docs: Documented new IABv5 sub upgrade/downgrade and manual renewal

9 years agoam d57871e0: am 8aa8960e: am a464d409: Merge "docs: Add steps to enable adb debugging...
Luan Nguyen [Fri, 27 Feb 2015 16:53:47 +0000 (16:53 +0000)]
am d57871e0: am 8aa8960e: am a464d409: Merge "docs: Add steps to enable adb debugging on Wear device" into lmp-docs

* commit 'd57871e00d77bc852948de30a01b6856a6cfeb9b':
  docs: Add steps to enable adb debugging on Wear device

9 years agoam b8593133: am c1120b45: am 8f0e9c75: Merge "doc: Add Japanese version of DAC/distri...
Ryosuke Matsuuchi [Fri, 27 Feb 2015 16:53:42 +0000 (16:53 +0000)]
am b8593133: am c1120b45: am 8f0e9c75: Merge "doc: Add Japanese version of DAC/distribute/ page." into lmp-docs

* commit 'b859313312a85285c2c243a5e58d133e308ee590':
  doc: Add Japanese version of DAC/distribute/ page.

9 years agoam 3daee377: am 7f26f2b9: am b5e00e5c: docs: Documented new IABv5 sub upgrade/downgra...
Andrew Solovay [Fri, 27 Feb 2015 16:53:37 +0000 (16:53 +0000)]
am 3daee377: am 7f26f2b9: am b5e00e5c: docs: Documented new IABv5 sub upgrade/downgrade and manual renewal

* commit '3daee37705d23a0f91680aa954e4bcdb2dfdf4e8':
  docs: Documented new IABv5 sub upgrade/downgrade and manual renewal

9 years agoam 8aa8960e: am a464d409: Merge "docs: Add steps to enable adb debugging on Wear...
Luan Nguyen [Fri, 27 Feb 2015 16:46:56 +0000 (16:46 +0000)]
am 8aa8960e: am a464d409: Merge "docs: Add steps to enable adb debugging on Wear device" into lmp-docs

* commit '8aa8960edb10089570acd5d3b19cfd9be7253fab':
  docs: Add steps to enable adb debugging on Wear device

9 years agoam c1120b45: am 8f0e9c75: Merge "doc: Add Japanese version of DAC/distribute/ page...
Ryosuke Matsuuchi [Fri, 27 Feb 2015 16:46:53 +0000 (16:46 +0000)]
am c1120b45: am 8f0e9c75: Merge "doc: Add Japanese version of DAC/distribute/ page." into lmp-docs

* commit 'c1120b459eb1ecabd54966cef1873f0f0707382d':
  doc: Add Japanese version of DAC/distribute/ page.

9 years agoam 7f26f2b9: am b5e00e5c: docs: Documented new IABv5 sub upgrade/downgrade and manual...
Andrew Solovay [Fri, 27 Feb 2015 16:46:49 +0000 (16:46 +0000)]
am 7f26f2b9: am b5e00e5c: docs: Documented new IABv5 sub upgrade/downgrade and manual renewal

* commit '7f26f2b96a23f32bca69862b254dbbe8b59049d9':
  docs: Documented new IABv5 sub upgrade/downgrade and manual renewal

9 years agoam a464d409: Merge "docs: Add steps to enable adb debugging on Wear device" into...
Luan Nguyen [Fri, 27 Feb 2015 16:37:46 +0000 (16:37 +0000)]
am a464d409: Merge "docs: Add steps to enable adb debugging on Wear device" into lmp-docs

* commit 'a464d409f68ca9a59ac4261edd46866ae2af68bf':
  docs: Add steps to enable adb debugging on Wear device

9 years agoam 8f0e9c75: Merge "doc: Add Japanese version of DAC/distribute/ page." into lmp...
Ryosuke Matsuuchi [Fri, 27 Feb 2015 16:37:42 +0000 (16:37 +0000)]
am 8f0e9c75: Merge "doc: Add Japanese version of DAC/distribute/ page." into lmp-docs

* commit '8f0e9c7593fee981fc4b3831aae76a1f20e236db':
  doc: Add Japanese version of DAC/distribute/ page.

9 years agoam b5e00e5c: docs: Documented new IABv5 sub upgrade/downgrade and manual renewal
Andrew Solovay [Fri, 27 Feb 2015 16:37:38 +0000 (16:37 +0000)]
am b5e00e5c: docs: Documented new IABv5 sub upgrade/downgrade and manual renewal

* commit 'b5e00e5c3db7fc7121aeff6dc7d20b21740d47e5':
  docs: Documented new IABv5 sub upgrade/downgrade and manual renewal

9 years agoMerge "docs: Add steps to enable adb debugging on Wear device" into lmp-docs
Luan Nguyen [Fri, 27 Feb 2015 15:07:01 +0000 (15:07 +0000)]
Merge "docs: Add steps to enable adb debugging on Wear device" into lmp-docs

9 years agoMerge "Separate NAT from forwarding." into lmp-mr1-wfc-dev
Lorenzo Colitti [Fri, 27 Feb 2015 07:09:23 +0000 (07:09 +0000)]
Merge "Separate NAT from forwarding." into lmp-mr1-wfc-dev

9 years agoSeparate NAT from forwarding.
Lorenzo Colitti [Wed, 25 Feb 2015 16:25:36 +0000 (01:25 +0900)]
Separate NAT from forwarding.

Bug: 19500693
Change-Id: I39878644e21d51def1c31d1857e815f473ef0938

9 years agoMerge "doc: Add Japanese version of DAC/distribute/ page." into lmp-docs
Ryosuke Matsuuchi [Fri, 27 Feb 2015 03:41:48 +0000 (03:41 +0000)]
Merge "doc: Add Japanese version of DAC/distribute/ page." into lmp-docs

9 years agoAdd status bar time for 5.1
Deepanshu Gupta [Fri, 27 Feb 2015 03:29:36 +0000 (19:29 -0800)]
Add status bar time for 5.1

Change-Id: I9469cdbbc5cbfe5cb99d9c4ee6f4e299246d409f

9 years agoMerge "Append forwarder name to ipfwd command" into lmp-mr1-wfc-dev
Lorenzo Colitti [Fri, 27 Feb 2015 00:46:12 +0000 (00:46 +0000)]
Merge "Append forwarder name to ipfwd command" into lmp-mr1-wfc-dev

9 years agoCorrect PorterDuff filters.
Deepanshu Gupta [Thu, 26 Feb 2015 22:34:57 +0000 (14:34 -0800)]
Correct PorterDuff filters.

1. Remove unused modes - makes the class more manageable, and missing
modes can always be readded from the git history.
2. Reuse the existing BlendComposite instances where possible.
3. Fix incorrect alpha computation for multiply mode.
4. Change the alpha computation for all blend modes to compenstate for
the fact that the color filter image that we create extends beyond the
image it is inteded to be applied to.

Change-Id: Iedebf289a23325ee4c6d406dcad46a9edb1855c7

9 years agodocs: Documented new IABv5 sub upgrade/downgrade and manual renewal
Andrew Solovay [Tue, 27 Jan 2015 03:35:37 +0000 (19:35 -0800)]
docs: Documented new IABv5 sub upgrade/downgrade and manual renewal

Documented new support for users upgrading/downgrading subscriptions
in the middle of a sub period, and for users manually renewing
before the subscription period ends. Also updated testing docs
to reflect that sandbox now supports testing subscriptions, and
documented new "autoRenewing" field in INAPP_PURCHASE_DATA.

See first comment for doc stage location.

bug: 18982828
bug: 18916814
bug: 18951608
bug: 18908756
Change-Id: I530b57d840ed5aeefe4c6a688a2e59aec41ec7d0

9 years agoFix codestyle for switch statements.
Deepanshu Gupta [Thu, 26 Feb 2015 22:32:30 +0000 (14:32 -0800)]
Fix codestyle for switch statements.

Fix intellij's codestyle settings for indenting switch/case statement.

Change-Id: I905231538fef0fcd7fa4e742f937b8da34f2e30f

9 years agoam 025f0938: Merge "Changing usage of carrier name field of SubInfoRecord" into lmp...
Sanket Padawe [Thu, 26 Feb 2015 22:09:10 +0000 (22:09 +0000)]
am 025f0938: Merge "Changing usage of carrier name field of SubInfoRecord" into lmp-mr1-dev

* commit '025f0938544bae3262acc24e9c6031b6de88901d':
  Changing usage of carrier name field of SubInfoRecord

9 years agoam 9df42df2: Merge "Keyguard: Use plmn/spn broadcast when no SIMs" into lmp-mr1-dev
Jason Monk [Thu, 26 Feb 2015 21:58:39 +0000 (21:58 +0000)]
am 9df42df2: Merge "Keyguard: Use plmn/spn broadcast when no SIMs" into lmp-mr1-dev

* commit '9df42df2bca0a7a91d813b19e084069675d4057b':
  Keyguard: Use plmn/spn broadcast when no SIMs

9 years agoMerge "Changing usage of carrier name field of SubInfoRecord" into lmp-mr1-dev
Sanket Padawe [Thu, 26 Feb 2015 21:58:27 +0000 (21:58 +0000)]
Merge "Changing usage of carrier name field of SubInfoRecord" into lmp-mr1-dev

9 years agoMerge "Keyguard: Use plmn/spn broadcast when no SIMs" into lmp-mr1-dev
Jason Monk [Thu, 26 Feb 2015 21:54:20 +0000 (21:54 +0000)]
Merge "Keyguard: Use plmn/spn broadcast when no SIMs" into lmp-mr1-dev

9 years agoam 328dc428: am 6bb23d62: am 29936684: am 0a504745: Merge "docs: 9patch tool update...
Rich Slogar [Thu, 26 Feb 2015 18:30:21 +0000 (18:30 +0000)]
am 328dc428: am 6bb23d62: am 29936684: am 0a504745: Merge "docs: 9patch tool update" into lmp-docs

* commit '328dc4288bc86b6f7a7db56d7bfb17053e94ec1c':
  docs: 9patch tool update

9 years agoam 6bb23d62: am 29936684: am 0a504745: Merge "docs: 9patch tool update" into lmp...
Rich Slogar [Thu, 26 Feb 2015 18:22:34 +0000 (18:22 +0000)]
am 6bb23d62: am 29936684: am 0a504745: Merge "docs: 9patch tool update" into lmp-docs

* commit '6bb23d627f608461f6dd5f40308ac176a327d99b':
  docs: 9patch tool update

9 years agoam 29936684: am 0a504745: Merge "docs: 9patch tool update" into lmp-docs
Rich Slogar [Thu, 26 Feb 2015 18:15:41 +0000 (18:15 +0000)]
am 29936684: am 0a504745: Merge "docs: 9patch tool update" into lmp-docs

* commit '299366847f50059fb3e13b573247d9a05d29eb3c':
  docs: 9patch tool update

9 years agoam 0a504745: Merge "docs: 9patch tool update" into lmp-docs
Rich Slogar [Thu, 26 Feb 2015 18:08:39 +0000 (18:08 +0000)]
am 0a504745: Merge "docs: 9patch tool update" into lmp-docs

* commit '0a504745b4f63bd9f1d5e40addf50a6e90b8522d':
  docs: 9patch tool update

9 years agoMerge "docs: 9patch tool update" into lmp-docs
Rich Slogar [Thu, 26 Feb 2015 18:02:41 +0000 (18:02 +0000)]
Merge "docs: 9patch tool update" into lmp-docs

9 years agoTelephony: Implementation for IWLAN.
Yashdev Singh [Mon, 23 Feb 2015 21:04:51 +0000 (13:04 -0800)]
Telephony: Implementation for IWLAN.

Introduce new RAT as IWLAN.
- Allow registration polling in airplane mode.
- Allow non-default PDP activation for iwlan RAT.

Implementation of iwlan and wwan coexistence.
- A new callback event for unsol oem hook response to indicate
  if cellular and iwlan RAT co-exists.
- If co-existence is possible then allow default PDP activation
  along with other PDPs.

Change-Id: Icc6f8111ec3c86ec06e8facd5a5b60b4d5e08e78

9 years agoam bd409177: am 1836eea0: am 41104632: am eedf6ad8: Merge "docs: remove exploring...
Rich Slogar [Wed, 25 Feb 2015 23:40:01 +0000 (23:40 +0000)]
am bd409177: am 1836eea0: am 41104632: am eedf6ad8: Merge "docs: remove exploring sdk link" into lmp-docs

* commit 'bd409177ec6b422e18d9e0c94ffab86dfd368976':
  docs: remove exploring sdk link

9 years agoam 81049aff: am f8a95b0b: am 84994e87: am db2ebca7: Merge "docs: note to install...
Rich Slogar [Wed, 25 Feb 2015 23:39:56 +0000 (23:39 +0000)]
am 81049aff: am f8a95b0b: am 84994e87: am db2ebca7: Merge "docs: note to install linux packages v2 update" into lmp-docs

* commit '81049aff4bad07427dc18543be1c759e16267a63':
  docs: note to install linux packages v2 update

9 years agoam 1836eea0: am 41104632: am eedf6ad8: Merge "docs: remove exploring sdk link" into...
Rich Slogar [Wed, 25 Feb 2015 23:32:51 +0000 (23:32 +0000)]
am 1836eea0: am 41104632: am eedf6ad8: Merge "docs: remove exploring sdk link" into lmp-docs

* commit '1836eea08229dda72ff89d24f75f9f4948be957e':
  docs: remove exploring sdk link

9 years agoam f8a95b0b: am 84994e87: am db2ebca7: Merge "docs: note to install linux packages...
Rich Slogar [Wed, 25 Feb 2015 23:32:46 +0000 (23:32 +0000)]
am f8a95b0b: am 84994e87: am db2ebca7: Merge "docs: note to install linux packages v2 update" into lmp-docs

* commit 'f8a95b0b6fc4e19c7935a2fb46c5b7b6cef3a194':
  docs: note to install linux packages v2 update

9 years agoam 41104632: am eedf6ad8: Merge "docs: remove exploring sdk link" into lmp-docs
Rich Slogar [Wed, 25 Feb 2015 23:25:11 +0000 (23:25 +0000)]
am 41104632: am eedf6ad8: Merge "docs: remove exploring sdk link" into lmp-docs

* commit '411046324743055e9eef3b04109c998b5354b496':
  docs: remove exploring sdk link

9 years agoam 84994e87: am db2ebca7: Merge "docs: note to install linux packages v2 update"...
Rich Slogar [Wed, 25 Feb 2015 23:25:07 +0000 (23:25 +0000)]
am 84994e87: am db2ebca7: Merge "docs: note to install linux packages v2 update" into lmp-docs

* commit '84994e876e728fa57f06d803f7c4abfbc9df40db':
  docs: note to install linux packages v2 update

9 years agoam eedf6ad8: Merge "docs: remove exploring sdk link" into lmp-docs
Rich Slogar [Wed, 25 Feb 2015 23:17:31 +0000 (23:17 +0000)]
am eedf6ad8: Merge "docs: remove exploring sdk link" into lmp-docs

* commit 'eedf6ad8ce1e15276311a78488e27388f049b4c0':
  docs: remove exploring sdk link

9 years agoam db2ebca7: Merge "docs: note to install linux packages v2 update" into lmp-docs
Rich Slogar [Wed, 25 Feb 2015 23:17:23 +0000 (23:17 +0000)]
am db2ebca7: Merge "docs: note to install linux packages v2 update" into lmp-docs

* commit 'db2ebca7ed10a4d5d943e414a35d4734b9987e91':
  docs: note to install linux packages v2 update

9 years agoMerge "docs: remove exploring sdk link" into lmp-docs
Rich Slogar [Wed, 25 Feb 2015 23:12:32 +0000 (23:12 +0000)]
Merge "docs: remove exploring sdk link" into lmp-docs

9 years agoMerge "docs: note to install linux packages v2 update" into lmp-docs
Rich Slogar [Wed, 25 Feb 2015 23:11:22 +0000 (23:11 +0000)]
Merge "docs: note to install linux packages v2 update" into lmp-docs

9 years agodocs: Add steps to enable adb debugging on Wear device
Luan Nguyen [Wed, 25 Feb 2015 17:42:07 +0000 (09:42 -0800)]
docs: Add steps to enable adb debugging on Wear device

bug: 19425073
Change-Id: Iead63dfe12c5187c5ed8e452fe7e934402ebd056

9 years agoam b46e4806: Merge "Remove TrustAgent whitelisting API" into lmp-mr1-dev
Jim Miller [Wed, 25 Feb 2015 18:09:37 +0000 (18:09 +0000)]
am b46e4806: Merge "Remove TrustAgent whitelisting API" into lmp-mr1-dev

* commit 'b46e48067fd03b63fa5f5191651ac2a5d009e226':
  Remove TrustAgent whitelisting API

9 years agoMerge "Remove TrustAgent whitelisting API" into lmp-mr1-dev
Jim Miller [Wed, 25 Feb 2015 18:04:57 +0000 (18:04 +0000)]
Merge "Remove TrustAgent whitelisting API" into lmp-mr1-dev

9 years agoam 8ffb574a: am f7224396: am c427b721: am 41418826: Merge "docs: Android for Work...
Joe Fernandez [Wed, 25 Feb 2015 17:35:37 +0000 (17:35 +0000)]
am 8ffb574a: am f7224396: am c427b721: am 41418826: Merge "docs: Android for Work developer landing page" into lmp-docs

* commit '8ffb574a5087b2099cef5f629568375caa0ddc9c':
  docs: Android for Work developer landing page

9 years agoam 7391b0a1: am e64301e6: am 790b1bc8: am d3cd0948: docs: New doc for creating an...
Andrew Solovay [Wed, 25 Feb 2015 17:35:33 +0000 (17:35 +0000)]
am 7391b0a1: am e64301e6: am 790b1bc8: am d3cd0948: docs: New doc for creating an AfW Work Policy Controller

* commit '7391b0a177f9ecf3c8e3a9657bbf1ae7000ce528':
  docs: New doc for creating an AfW Work Policy Controller

9 years agoam 93df7f07: am 032e931a: am 6ffe1058: am a2ae6c9d: Merge "docs: New "implementing...
Andrew Solovay [Wed, 25 Feb 2015 17:35:29 +0000 (17:35 +0000)]
am 93df7f07: am 032e931a: am 6ffe1058: am a2ae6c9d: Merge "docs: New "implementing app restrictions" doc" into lmp-docs

* commit '93df7f0740a6d2044c29227ac6f684c74aa49ff7':
  docs: New "implementing app restrictions" doc

9 years agoam 7fc5b5a1: am a9ad0fc7: am f2525ed3: am ea2a0648: Explain behavior of boundless...
Chris Craik [Wed, 25 Feb 2015 17:35:25 +0000 (17:35 +0000)]
am 7fc5b5a1: am a9ad0fc7: am f2525ed3: am ea2a0648: Explain behavior of boundless ripple projection

* commit '7fc5b5a129a3599c4a213117415e113a85d09745':
  Explain behavior of boundless ripple projection

9 years agoam f7224396: am c427b721: am 41418826: Merge "docs: Android for Work developer landin...
Joe Fernandez [Wed, 25 Feb 2015 13:09:56 +0000 (13:09 +0000)]
am f7224396: am c427b721: am 41418826: Merge "docs: Android for Work developer landing page" into lmp-docs

* commit 'f7224396ee8416630b9387995a79faae1ee68b7c':
  docs: Android for Work developer landing page

9 years agoam e64301e6: am 790b1bc8: am d3cd0948: docs: New doc for creating an AfW Work Policy...
Andrew Solovay [Wed, 25 Feb 2015 13:09:33 +0000 (13:09 +0000)]
am e64301e6: am 790b1bc8: am d3cd0948: docs: New doc for creating an AfW Work Policy Controller

* commit 'e64301e639e73f346a78584af2727bc98f3d81ae':
  docs: New doc for creating an AfW Work Policy Controller

9 years agoam 032e931a: am 6ffe1058: am a2ae6c9d: Merge "docs: New "implementing app restriction...
Andrew Solovay [Wed, 25 Feb 2015 13:09:29 +0000 (13:09 +0000)]
am 032e931a: am 6ffe1058: am a2ae6c9d: Merge "docs: New "implementing app restrictions" doc" into lmp-docs

* commit '032e931a806d21d5fa190d1d28f8d65ee0fb4926':
  docs: New "implementing app restrictions" doc