160321 Commits

Author SHA1 Message Date
Luan Nguyen
dedba01ac8 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
2015-02-27 16:53:47 +00:00
Ryosuke Matsuuchi
d4cdf18e1c 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.
2015-02-27 16:53:42 +00:00
Andrew Solovay
3a5b08153e 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
2015-02-27 16:53:37 +00:00
Luan Nguyen
d57871e00d 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
2015-02-27 16:46:56 +00:00
Ryosuke Matsuuchi
b859313312 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.
2015-02-27 16:46:53 +00:00
Andrew Solovay
3daee37705 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
2015-02-27 16:46:49 +00:00
Luan Nguyen
8aa8960edb 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
2015-02-27 16:37:46 +00:00
Ryosuke Matsuuchi
c1120b459e am 8f0e9c75: Merge "doc: Add Japanese version of DAC/distribute/ page." into lmp-docs
* commit '8f0e9c7593fee981fc4b3831aae76a1f20e236db':
  doc: Add Japanese version of DAC/distribute/ page.
2015-02-27 16:37:42 +00:00
Andrew Solovay
7f26f2b96a am b5e00e5c: docs: Documented new IABv5 sub upgrade/downgrade and manual renewal
* commit 'b5e00e5c3db7fc7121aeff6dc7d20b21740d47e5':
  docs: Documented new IABv5 sub upgrade/downgrade and manual renewal
2015-02-27 16:37:38 +00:00
Luan Nguyen
a464d409f6 Merge "docs: Add steps to enable adb debugging on Wear device" into lmp-docs 2015-02-27 15:07:02 +00:00
Ryosuke Matsuuchi
8f0e9c7593 Merge "doc: Add Japanese version of DAC/distribute/ page." into lmp-docs 2015-02-27 03:41:51 +00:00
Andrew Solovay
b5e00e5c3d 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
2015-02-26 14:34:48 -08:00
Sanket Padawe
025f093854 Merge "Changing usage of carrier name field of SubInfoRecord" into lmp-mr1-dev 2015-02-26 21:58:28 +00:00
Jason Monk
9df42df2bc Merge "Keyguard: Use plmn/spn broadcast when no SIMs" into lmp-mr1-dev 2015-02-26 21:54:23 +00:00
Rich Slogar
328dc4288b am 6bb23d62: am 29936684: am 0a504745: Merge "docs: 9patch tool update" into lmp-docs
* commit '6bb23d627f608461f6dd5f40308ac176a327d99b':
  docs: 9patch tool update
2015-02-26 18:22:34 +00:00
Rich Slogar
6bb23d627f am 29936684: am 0a504745: Merge "docs: 9patch tool update" into lmp-docs
* commit '299366847f50059fb3e13b573247d9a05d29eb3c':
  docs: 9patch tool update
2015-02-26 18:15:41 +00:00
Rich Slogar
299366847f am 0a504745: Merge "docs: 9patch tool update" into lmp-docs
* commit '0a504745b4f63bd9f1d5e40addf50a6e90b8522d':
  docs: 9patch tool update
2015-02-26 18:08:39 +00:00
Rich Slogar
0a504745b4 Merge "docs: 9patch tool update" into lmp-docs 2015-02-26 18:02:43 +00:00
Rich Slogar
bd409177ec am 1836eea0: am 41104632: am eedf6ad8: Merge "docs: remove exploring sdk link" into lmp-docs
* commit '1836eea08229dda72ff89d24f75f9f4948be957e':
  docs: remove exploring sdk link
2015-02-25 23:32:51 +00:00
Rich Slogar
81049aff4b 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
2015-02-25 23:32:46 +00:00
Rich Slogar
1836eea082 am 41104632: am eedf6ad8: Merge "docs: remove exploring sdk link" into lmp-docs
* commit '411046324743055e9eef3b04109c998b5354b496':
  docs: remove exploring sdk link
2015-02-25 23:25:11 +00:00
Rich Slogar
f8a95b0b6f 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
2015-02-25 23:25:07 +00:00
Rich Slogar
4110463247 am eedf6ad8: Merge "docs: remove exploring sdk link" into lmp-docs
* commit 'eedf6ad8ce1e15276311a78488e27388f049b4c0':
  docs: remove exploring sdk link
2015-02-25 23:17:31 +00:00
Rich Slogar
84994e876e am db2ebca7: Merge "docs: note to install linux packages v2 update" into lmp-docs
* commit 'db2ebca7ed10a4d5d943e414a35d4734b9987e91':
  docs: note to install linux packages v2 update
2015-02-25 23:17:23 +00:00
Rich Slogar
eedf6ad8ce Merge "docs: remove exploring sdk link" into lmp-docs 2015-02-25 23:12:37 +00:00
Rich Slogar
db2ebca7ed Merge "docs: note to install linux packages v2 update" into lmp-docs 2015-02-25 23:11:24 +00:00
Luan Nguyen
43836ac798 docs: Add steps to enable adb debugging on Wear device
bug: 19425073
Change-Id: Iead63dfe12c5187c5ed8e452fe7e934402ebd056
2015-02-25 15:09:29 -08:00
Jim Miller
b46e48067f Merge "Remove TrustAgent whitelisting API" into lmp-mr1-dev 2015-02-25 18:04:58 +00:00
Joe Fernandez
8ffb574a50 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
2015-02-25 13:09:56 +00:00
Andrew Solovay
7391b0a177 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
2015-02-25 13:09:33 +00:00
Andrew Solovay
93df7f0740 am 032e931a: am 6ffe1058: am a2ae6c9d: Merge "docs: New "implementing app restrictions" doc" into lmp-docs
* commit '032e931a806d21d5fa190d1d28f8d65ee0fb4926':
  docs: New "implementing app restrictions" doc
2015-02-25 13:09:29 +00:00
Chris Craik
7fc5b5a129 am a9ad0fc7: am f2525ed3: am ea2a0648: Explain behavior of boundless ripple projection
* commit 'a9ad0fc793e3479e678441f2ed7abd47994ab74d':
  Explain behavior of boundless ripple projection
2015-02-25 13:09:24 +00:00
Joe Fernandez
f7224396ee am c427b721: am 41418826: Merge "docs: Android for Work developer landing page" into lmp-docs
* commit 'c427b721b681b19f40e45ed82ae0c628f3f5b528':
  docs: Android for Work developer landing page
2015-02-25 08:06:01 +00:00
Joe Fernandez
c427b721b6 am 41418826: Merge "docs: Android for Work developer landing page" into lmp-docs
* commit '414188262311ec48235095a5dec622b24f7e69ef':
  docs: Android for Work developer landing page
2015-02-25 07:59:48 +00:00
Joe Fernandez
4141882623 Merge "docs: Android for Work developer landing page" into lmp-docs 2015-02-25 07:52:30 +00:00
Andrew Solovay
e64301e639 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
2015-02-25 07:49:37 +00:00
Andrew Solovay
790b1bc864 am d3cd0948: docs: New doc for creating an AfW Work Policy Controller
* commit 'd3cd0948c8c4662c8711433b756c82fbe2f7a3ad':
  docs: New doc for creating an AfW Work Policy Controller
2015-02-25 07:42:44 +00:00
Andrew Solovay
d3cd0948c8 docs: New doc for creating an AfW Work Policy Controller
See first comment for doc stage location.

Change-Id: I0c9c0f849c049d33fc66e2bd8ac5ba284c7b9415
2015-02-24 23:31:41 -08:00
Jim Miller
bc4f2ccf6c 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
2015-02-24 20:15:02 -08:00
Joe Fernandez
108ccac1a1 docs: Android for Work developer landing page
Change-Id: I9886e82bd33357c3fc7296859d70c98747d8c14a
2015-02-24 17:32:30 -08:00
Andrew Solovay
032e931a80 am 6ffe1058: am a2ae6c9d: Merge "docs: New "implementing app restrictions" doc" into lmp-docs
* commit '6ffe1058463e5f4e65aa131796b37c0443d1b44b':
  docs: New "implementing app restrictions" doc
2015-02-25 01:14:58 +00:00
Andrew Solovay
6ffe105846 am a2ae6c9d: Merge "docs: New "implementing app restrictions" doc" into lmp-docs
* commit 'a2ae6c9dbffe76bd5bc452fbd85ae92e5e3b9a5c':
  docs: New "implementing app restrictions" doc
2015-02-25 01:07:25 +00:00
Rich Slogar
69044ae842 docs: note to install linux packages v2 update
b.android 155803

Change-Id: Ia41c41be82fcbd09c67425ddbd75405eec095834
2015-02-24 17:01:58 -08:00
Andrew Solovay
a2ae6c9dbf Merge "docs: New "implementing app restrictions" doc" into lmp-docs 2015-02-25 01:01:56 +00:00
Chris Craik
a9ad0fc793 am f2525ed3: am ea2a0648: Explain behavior of boundless ripple projection
* commit 'f2525ed3f4fbb61f7a5e28d2673a3557fbb7773f':
  Explain behavior of boundless ripple projection
2015-02-25 00:26:51 +00:00
Andrew Solovay
79cb98c6ce 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
2015-02-24 16:20:27 -08:00
Chris Craik
f2525ed3f4 am ea2a0648: Explain behavior of boundless ripple projection
* commit 'ea2a0648a85a059f7235fbae69df87ba511832cf':
  Explain behavior of boundless ripple projection
2015-02-25 00:18:51 +00:00
Chris Craik
ea2a0648a8 Explain behavior of boundless ripple projection
Change-Id: I27d5c194750313d5d4e0d9dd541f3157b75340ab
2015-02-25 00:12:38 +00:00
Sanket Padawe
ea4713d6e5 Changing usage of carrier name field of SubInfoRecord
Bug: 19476304
Change-Id: Ia16465584cf31858bbf1ae36cfdbf21184de10d7
2015-02-24 13:15:15 -08:00
Jason Monk
de3260b5bf 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
2015-02-24 10:13:47 -05:00