OSDN Git Service

android-x86/frameworks-base.git
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 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 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 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 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

9 years agoam a9ad0fc7: am f2525ed3: am ea2a0648: Explain behavior of boundless ripple projection
Chris Craik [Wed, 25 Feb 2015 13:09:24 +0000 (13:09 +0000)]
am a9ad0fc7: am f2525ed3: am ea2a0648: Explain behavior of boundless ripple projection

* commit 'a9ad0fc793e3479e678441f2ed7abd47994ab74d':
  Explain behavior of boundless ripple projection

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

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

9 years agoam 41418826: Merge "docs: Android for Work developer landing page" into lmp-docs
Joe Fernandez [Wed, 25 Feb 2015 07:59:48 +0000 (07:59 +0000)]
am 41418826: Merge "docs: Android for Work developer landing page" into lmp-docs

* commit '414188262311ec48235095a5dec622b24f7e69ef':
  docs: Android for Work developer landing page

9 years agoMerge "docs: Android for Work developer landing page" into lmp-docs
Joe Fernandez [Wed, 25 Feb 2015 07:52:29 +0000 (07:52 +0000)]
Merge "docs: Android for Work developer landing page" into lmp-docs

9 years agoam 790b1bc8: am d3cd0948: docs: New doc for creating an AfW Work Policy Controller
Andrew Solovay [Wed, 25 Feb 2015 07:49:37 +0000 (07:49 +0000)]
am 790b1bc8: am d3cd0948: docs: New doc for creating an AfW Work Policy Controller

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

9 years agoam d3cd0948: docs: New doc for creating an AfW Work Policy Controller
Andrew Solovay [Wed, 25 Feb 2015 07:42:44 +0000 (07:42 +0000)]
am d3cd0948: docs: New doc for creating an AfW Work Policy Controller

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

9 years agodocs: New doc for creating an AfW Work Policy Controller
Andrew Solovay [Fri, 20 Feb 2015 01:57:50 +0000 (17:57 -0800)]
docs: New doc for creating an AfW Work Policy Controller

See first comment for doc stage location.

Change-Id: I0c9c0f849c049d33fc66e2bd8ac5ba284c7b9415

9 years agoRemove TrustAgent whitelisting API
Jim Miller [Wed, 25 Feb 2015 02:00:25 +0000 (18:00 -0800)]
Remove TrustAgent whitelisting API

Due to a bug caught late in the release, this API is broken
and should be removed from API 22 because it's too late for
a fix and there's no workaround.

Bug 19461292

Change-Id: Ib0757a4484b14afe7f83ae9527bb3f5f4834ee62

9 years agoAppend forwarder name to ipfwd command
Nilesh Poddar [Tue, 24 Feb 2015 20:11:11 +0000 (12:11 -0800)]
Append forwarder name to ipfwd command

Pass the name of entity that is requesting to enable/disable
ip forwarding

Change-Id: Iaf04768a23c417eb7d40af776c6fc76efaa67bb7

9 years agodocs: Android for Work developer landing page
Joe Fernandez [Fri, 20 Feb 2015 07:56:07 +0000 (23:56 -0800)]
docs: Android for Work developer landing page

Change-Id: I9886e82bd33357c3fc7296859d70c98747d8c14a

9 years agoam 6ffe1058: am a2ae6c9d: Merge "docs: New "implementing app restrictions" doc" into...
Andrew Solovay [Wed, 25 Feb 2015 01:14:58 +0000 (01:14 +0000)]
am 6ffe1058: am a2ae6c9d: Merge "docs: New "implementing app restrictions" doc" into lmp-docs

* commit '6ffe1058463e5f4e65aa131796b37c0443d1b44b':
  docs: New "implementing app restrictions" doc

9 years agoam a2ae6c9d: Merge "docs: New "implementing app restrictions" doc" into lmp-docs
Andrew Solovay [Wed, 25 Feb 2015 01:07:25 +0000 (01:07 +0000)]
am a2ae6c9d: Merge "docs: New "implementing app restrictions" doc" into lmp-docs

* commit 'a2ae6c9dbffe76bd5bc452fbd85ae92e5e3b9a5c':
  docs: New "implementing app restrictions" doc

9 years agodocs: note to install linux packages v2 update
Rich Slogar [Wed, 25 Feb 2015 00:58:34 +0000 (16:58 -0800)]
docs: note to install linux packages v2 update

b.android 155803

Change-Id: Ia41c41be82fcbd09c67425ddbd75405eec095834

9 years agoMerge "docs: New "implementing app restrictions" doc" into lmp-docs
Andrew Solovay [Wed, 25 Feb 2015 01:01:55 +0000 (01:01 +0000)]
Merge "docs: New "implementing app restrictions" doc" into lmp-docs

9 years agoam f2525ed3: am ea2a0648: Explain behavior of boundless ripple projection
Chris Craik [Wed, 25 Feb 2015 00:26:51 +0000 (00:26 +0000)]
am f2525ed3: am ea2a0648: Explain behavior of boundless ripple projection

* commit 'f2525ed3f4fbb61f7a5e28d2673a3557fbb7773f':
  Explain behavior of boundless ripple projection

9 years agodocs: New "implementing app restrictions" doc
Andrew Solovay [Wed, 11 Feb 2015 21:12:18 +0000 (13:12 -0800)]
docs: New "implementing app restrictions" doc

New doc on app restrictions, aimed primarily at developers of
enterprise apps. See first comment for doc stage location.

Change-Id: I561780d218c78ae0dc4e4e54d925302c718f96ac

9 years agoam ea2a0648: Explain behavior of boundless ripple projection
Chris Craik [Wed, 25 Feb 2015 00:18:51 +0000 (00:18 +0000)]
am ea2a0648: Explain behavior of boundless ripple projection

* commit 'ea2a0648a85a059f7235fbae69df87ba511832cf':
  Explain behavior of boundless ripple projection

9 years agoExplain behavior of boundless ripple projection
Chris Craik [Tue, 24 Feb 2015 21:58:26 +0000 (13:58 -0800)]
Explain behavior of boundless ripple projection

Change-Id: I27d5c194750313d5d4e0d9dd541f3157b75340ab

9 years agoChanging usage of carrier name field of SubInfoRecord
Sanket Padawe [Tue, 24 Feb 2015 21:15:15 +0000 (13:15 -0800)]
Changing usage of carrier name field of SubInfoRecord

Bug: 19476304
Change-Id: Ia16465584cf31858bbf1ae36cfdbf21184de10d7

9 years agoKeyguard: Use plmn/spn broadcast when no SIMs
Jason Monk [Tue, 24 Feb 2015 13:55:26 +0000 (08:55 -0500)]
Keyguard: Use plmn/spn broadcast when no SIMs

The keyguard needs to show either 'emergency calls only' or 'no service'
depending on whether there is service available, so try to pull this from
the old sticky broadcast containing plmn/spn.

Bug: 19476978
Change-Id: I83523cc4c7dd5f46bd97df2cc9ecdb38d1c2e001

9 years agodocs: remove exploring sdk link
Rich Slogar [Mon, 23 Feb 2015 19:30:02 +0000 (11:30 -0800)]
docs: remove exploring sdk link

b.android 153523

Change-Id: Iaf4de80196d10d686d5a4bde5ffa4169df2810cd

9 years agoam 99142d29: am 3f8e2b93: am 30a67cd1: Merge "Set forceFramework correctly for includ...
Deepanshu Gupta [Mon, 23 Feb 2015 19:15:50 +0000 (19:15 +0000)]
am 99142d29: am 3f8e2b93: am 30a67cd1: Merge "Set forceFramework correctly for included layouts." into lmp-dev

* commit '99142d298213e93f673057c2334b04b38f7e4450':
  Set forceFramework correctly for included layouts.

9 years agoam 3f8e2b93: am 30a67cd1: Merge "Set forceFramework correctly for included layouts...
Deepanshu Gupta [Mon, 23 Feb 2015 19:09:14 +0000 (19:09 +0000)]
am 3f8e2b93: am 30a67cd1: Merge "Set forceFramework correctly for included layouts." into lmp-dev

* commit '3f8e2b9302fba0ace67fb0459d6ffb0884c4d80b':
  Set forceFramework correctly for included layouts.

9 years agoam 30a67cd1: Merge "Set forceFramework correctly for included layouts." into lmp-dev
Deepanshu Gupta [Mon, 23 Feb 2015 19:03:29 +0000 (19:03 +0000)]
am 30a67cd1: Merge "Set forceFramework correctly for included layouts." into lmp-dev

* commit '30a67cd17af03e53b8be5638f7f70d2989a7cd78':
  Set forceFramework correctly for included layouts.

9 years agoMerge "Set forceFramework correctly for included layouts." into lmp-dev
Deepanshu Gupta [Mon, 23 Feb 2015 18:56:27 +0000 (18:56 +0000)]
Merge "Set forceFramework correctly for included layouts." into lmp-dev

9 years agoam 3570268b: am 09e9076d: am ab0f8ff7: am 88e0145f: Merge "Fixes several typos."...
David Friedman [Mon, 23 Feb 2015 18:26:49 +0000 (18:26 +0000)]
am 3570268b: am 09e9076d: am ab0f8ff7: am 88e0145f: Merge "Fixes several typos." into lmp-docs

* commit '3570268bcf1e4c375d8b592714f8b7be25819873':
  Fixes several typos.

9 years agoam f066c235: am 18c8a35f: am 8e604689: am 3c26756a: Merge "Update Google Play brand...
David Friedman [Mon, 23 Feb 2015 18:26:45 +0000 (18:26 +0000)]
am f066c235: am 18c8a35f: am 8e604689: am 3c26756a: Merge "Update Google Play brand-info page. Bug: 18257984" into lmp-docs

* commit 'f066c2358d48fdc2ecbc28af99bc8332a3d78ce1':
  Update Google Play brand-info page. Bug: 18257984

9 years agoam 09e9076d: am ab0f8ff7: am 88e0145f: Merge "Fixes several typos." into lmp-docs
David Friedman [Mon, 23 Feb 2015 18:20:37 +0000 (18:20 +0000)]
am 09e9076d: am ab0f8ff7: am 88e0145f: Merge "Fixes several typos." into lmp-docs

* commit '09e9076ddfd5e9f738cd5096409ff3fb61174803':
  Fixes several typos.

9 years agoam 18c8a35f: am 8e604689: am 3c26756a: Merge "Update Google Play brand-info page...
David Friedman [Mon, 23 Feb 2015 18:20:32 +0000 (18:20 +0000)]
am 18c8a35f: am 8e604689: am 3c26756a: Merge "Update Google Play brand-info page. Bug: 18257984" into lmp-docs

* commit '18c8a35fa4e775c3b515e739b0f32981395914ad':
  Update Google Play brand-info page. Bug: 18257984

9 years agoam ab0f8ff7: am 88e0145f: Merge "Fixes several typos." into lmp-docs
David Friedman [Mon, 23 Feb 2015 18:13:36 +0000 (18:13 +0000)]
am ab0f8ff7: am 88e0145f: Merge "Fixes several typos." into lmp-docs

* commit 'ab0f8ff740d314182ccc644f118a7f8ba6c4937e':
  Fixes several typos.

9 years agoam 8e604689: am 3c26756a: Merge "Update Google Play brand-info page. Bug: 18257984...
David Friedman [Mon, 23 Feb 2015 18:13:32 +0000 (18:13 +0000)]
am 8e604689: am 3c26756a: Merge "Update Google Play brand-info page. Bug: 18257984" into lmp-docs

* commit '8e604689c8c8f8ad073e12094991daa712cd8f38':
  Update Google Play brand-info page. Bug: 18257984

9 years agoam 88e0145f: Merge "Fixes several typos." into lmp-docs
David Friedman [Mon, 23 Feb 2015 18:06:47 +0000 (18:06 +0000)]
am 88e0145f: Merge "Fixes several typos." into lmp-docs

* commit '88e0145fb82b6711527ab173e4dc817e3f430708':
  Fixes several typos.

9 years agoam 3c26756a: Merge "Update Google Play brand-info page. Bug: 18257984" into lmp-docs
David Friedman [Mon, 23 Feb 2015 18:06:43 +0000 (18:06 +0000)]
am 3c26756a: Merge "Update Google Play brand-info page. Bug: 18257984" into lmp-docs

* commit '3c26756aefae228941588042d677424b54167aa7':
  Update Google Play brand-info page. Bug: 18257984

9 years agoMerge "Fixes several typos." into lmp-docs
David Friedman [Mon, 23 Feb 2015 18:05:35 +0000 (18:05 +0000)]
Merge "Fixes several typos." into lmp-docs

9 years agoMerge "Update Google Play brand-info page. Bug: 18257984" into lmp-docs
David Friedman [Mon, 23 Feb 2015 18:02:25 +0000 (18:02 +0000)]
Merge "Update Google Play brand-info page. Bug: 18257984" into lmp-docs

9 years agoSet forceFramework correctly for included layouts.
Deepanshu Gupta [Mon, 23 Feb 2015 17:18:08 +0000 (09:18 -0800)]
Set forceFramework correctly for included layouts.

Bug: http://b.android.com/151326
Change-Id: I759f6e1a7a1c83bbbb771ddbb92843a105acffa4

9 years agoam aba93780: am 5b60b1a0: am a91f6d00: am 4a99918b: Merge "docs: android plugin revis...
Rich Slogar [Sat, 21 Feb 2015 01:16:49 +0000 (01:16 +0000)]
am aba93780: am 5b60b1a0: am a91f6d00: am 4a99918b: Merge "docs: android plugin revisions page v2" into lmp-docs

* commit 'aba93780b47472f411737744957af00ae8d12220':
  docs: android plugin revisions page v2

9 years agoam 5b60b1a0: am a91f6d00: am 4a99918b: Merge "docs: android plugin revisions page...
Rich Slogar [Sat, 21 Feb 2015 01:04:52 +0000 (01:04 +0000)]
am 5b60b1a0: am a91f6d00: am 4a99918b: Merge "docs: android plugin revisions page v2" into lmp-docs

* commit '5b60b1a0401afb4d1addf53ca40facb5b5f6c0ee':
  docs: android plugin revisions page v2

9 years agoam a91f6d00: am 4a99918b: Merge "docs: android plugin revisions page v2" into lmp...
Rich Slogar [Sat, 21 Feb 2015 00:58:17 +0000 (00:58 +0000)]
am a91f6d00: am 4a99918b: Merge "docs: android plugin revisions page v2" into lmp-docs

* commit 'a91f6d0003d852fc744ce4ce3a14b0786ac2f26f':
  docs: android plugin revisions page v2

9 years agoam 4a99918b: Merge "docs: android plugin revisions page v2" into lmp-docs
Rich Slogar [Sat, 21 Feb 2015 00:51:05 +0000 (00:51 +0000)]
am 4a99918b: Merge "docs: android plugin revisions page v2" into lmp-docs

* commit '4a99918b40329e7d041db0de1e1863d688eb1b3b':
  docs: android plugin revisions page v2

9 years agoMerge "docs: android plugin revisions page v2" into lmp-docs
Rich Slogar [Sat, 21 Feb 2015 00:44:49 +0000 (00:44 +0000)]
Merge "docs: android plugin revisions page v2" into lmp-docs

9 years agoUpdate Google Play brand-info page.
David Friedman [Fri, 13 Feb 2015 03:43:35 +0000 (19:43 -0800)]
Update Google Play brand-info page.
Bug: 18257984

Change-Id: I8f41ace9bfef4b7fe1c7ad8b5fd4ea92f1438f4c

9 years agoam 677a1754: am 969848c4: am f900a1f4: am 81752cf5: Merge "docs: Fix issue with older...
Luan Nguyen [Sat, 21 Feb 2015 00:00:48 +0000 (00:00 +0000)]
am 677a1754: am 969848c4: am f900a1f4: am 81752cf5: Merge "docs: Fix issue with older devices section not expanding" into lmp-docs

* commit '677a175481a5d4eed73168a02406f6226f2c0c57':
  docs: Fix issue with older devices section not expanding

9 years agoam 969848c4: am f900a1f4: am 81752cf5: Merge "docs: Fix issue with older devices...
Luan Nguyen [Fri, 20 Feb 2015 23:54:15 +0000 (23:54 +0000)]
am 969848c4: am f900a1f4: am 81752cf5: Merge "docs: Fix issue with older devices section not expanding" into lmp-docs

* commit '969848c4484b5430e00cac7c317cc5e35e7ec8f5':
  docs: Fix issue with older devices section not expanding

9 years agoam f900a1f4: am 81752cf5: Merge "docs: Fix issue with older devices section not expan...
Luan Nguyen [Fri, 20 Feb 2015 23:48:00 +0000 (23:48 +0000)]
am f900a1f4: am 81752cf5: Merge "docs: Fix issue with older devices section not expanding" into lmp-docs

* commit 'f900a1f48abde96e41f40f61d3610b6245a9f94c':
  docs: Fix issue with older devices section not expanding