200042 Commits

Author SHA1 Message Date
Fyodor Kupolov
3f51188294 Merge "Check location permission/appop in getScanResults" into mnc-dev 2015-07-09 17:14:19 +00:00
Robert Greenwalt
b091695bd9 Merge "Revive NetworkInfo's SUSPENDED state." into mnc-dev 2015-07-09 17:09:17 +00:00
Jeff Sharkey
e21f6af3b6 am ee4a534b: Merge "Timeout when partitioning takes too long." into mnc-dev
* commit 'ee4a534b7bbe95fa913473e3288787fcd1050c49':
  Timeout when partitioning takes too long.
2015-07-09 17:07:33 +00:00
Jeff Sharkey
cda1820411 am a419076e: Merge "Add grant flag support to "install-create" verb." into mnc-dev
* commit 'a419076eab4ebf54186c5801216f611e080edf5f':
  Add grant flag support to "install-create" verb.
2015-07-09 17:07:28 +00:00
Mikhail Naganov
fa85a888a0 am abb8dc97: Merge "Enhance documentation of WebSettings.WebSettings method" into mnc-dev
* commit 'abb8dc97586cc15fa16bab7dd80ffe02a379550f':
  Enhance documentation of WebSettings.WebSettings method
2015-07-09 17:07:23 +00:00
Jeff Sharkey
ee4a534b7b Merge "Timeout when partitioning takes too long." into mnc-dev 2015-07-09 16:59:16 +00:00
Jeff Sharkey
a419076eab Merge "Add grant flag support to "install-create" verb." into mnc-dev 2015-07-09 16:58:47 +00:00
Mikhail Naganov
abb8dc9758 Merge "Enhance documentation of WebSettings.WebSettings method" into mnc-dev 2015-07-09 16:53:38 +00:00
Alan Viverette
5d3d23199d Add missing break in AccessibilityEvent.eventTypeToString()
Bug: 22331852
Change-Id: I6f75dde0fb29715d05ef8e8b0e16c3a5a2b9d5e8
2015-07-09 09:51:46 -07:00
Jeff Sharkey
edcdaf6463 Timeout when partitioning takes too long.
Otherwise we leave user hanging in wizard forever, instead of
telling them that something went wrong.

Bug: 20914299
Change-Id: Ib9ff3a8c316976c6a1dfdaffa10762abbea0c229
2015-07-09 09:45:39 -07:00
Jeff Sharkey
396080dd02 Add grant flag support to "install-create" verb.
This matches the "install" behavior.

Bug: 22331569
Change-Id: I07bfe067bd4be01fc92126750b0ff25a5c5ba5c9
2015-07-09 09:16:07 -07:00
Jason Monk
7150d7fa35 Remove data icon for WFC
Bug: 22095746
Change-Id: I0ca8420c2d88425cbb6da5fcc02c083355e933e9
2015-07-09 10:14:12 -04:00
Kenny Guy
f6db3a2f31 am f25062d4: am 084a716d: am 7d170797: Merge "Mute correct user from device policy manager." into mnc-dev
* commit 'f25062d44f85a0a819a696913207f50453358e90':
  Mute correct user from device policy manager.
2015-07-09 10:43:07 +00:00
Narayan Kamath
49df8dff5f am af7cf1c4: am 1601c604: am 14b50394: Reduce overly aggressive use of narrowAm / narrowPm.
* commit 'af7cf1c495a660170c5907d7cc038fa2521f8d58':
  Reduce overly aggressive use of narrowAm / narrowPm.
2015-07-09 10:43:02 +00:00
Kenny Guy
f25062d44f am 084a716d: am 7d170797: Merge "Mute correct user from device policy manager." into mnc-dev
* commit '084a716daead0fbb4912ecfc4d44fba28673fd29':
  Mute correct user from device policy manager.
2015-07-09 10:30:43 +00:00
Narayan Kamath
af7cf1c495 am 1601c604: am 14b50394: Reduce overly aggressive use of narrowAm / narrowPm.
* commit '1601c6045c91b4f6b1cb3be0ba8ec782f4f457ed':
  Reduce overly aggressive use of narrowAm / narrowPm.
2015-07-09 10:30:38 +00:00
Kenny Guy
084a716dae am 7d170797: Merge "Mute correct user from device policy manager." into mnc-dev
* commit '7d170797ac844124b013b77cc220ccf115db12b7':
  Mute correct user from device policy manager.
2015-07-09 10:18:32 +00:00
Narayan Kamath
1601c6045c am 14b50394: Reduce overly aggressive use of narrowAm / narrowPm.
* commit '14b503947727d7e58c9f2d50ceada378031fbe59':
  Reduce overly aggressive use of narrowAm / narrowPm.
2015-07-09 10:18:28 +00:00
Kenny Guy
7d170797ac Merge "Mute correct user from device policy manager." into mnc-dev 2015-07-09 10:06:25 +00:00
Narayan Kamath
14b5039477 Reduce overly aggressive use of narrowAm / narrowPm.
Increase threshold to 4 from 2. Given that this threshold is
applied independently, we now have a few more languages where we
use a mixture of narrow and regular AM/PM markers. Those languages
are : Bodo (brx), Cherokee (chr), Ewe (ee), German Swiss (gsw, not de-CH)
and Makonde (kde).

I've included a full table of diffs in the commit message.

bug: 22208502

1,5c1,5
<     L= af AM= v , PM= n
<     L= af-NA AM= v , PM= n
<     L= af-ZA AM= v , PM= n
<     L= agq AM= a , PM= p
<     L= agq-CM AM= a , PM= p
---
>     L= af AM= vm. , PM= nm.
>     L= af-NA AM= vm. , PM= nm.
>     L= af-ZA AM= vm. , PM= nm.
>     L= agq AM= a.g , PM= a.k
>     L= agq-CM AM= a.g , PM= a.k
9,10c9,10
<     L= am AM= ጠ , PM= ከ
<     L= am-ET AM= ጠ , PM= ከ
---
>     L= am AM= ጥዋት , PM= ከሰዓት
>     L= am-ET AM= ጥዋት , PM= ከሰዓት
68,71c68,71
<     L= br AM= am , PM= gm
<     L= br-FR AM= am , PM= gm
<     L= brx AM= a , PM= p
<     L= brx-IN AM= a , PM= p
---
>     L= br AM= A.M. , PM= G.M.
>     L= br-FR AM= A.M. , PM= G.M.
>     L= brx AM= फुं , PM= p
>     L= brx-IN AM= फुं , PM= p
84,85c84,85
<     L= chr AM= a , PM= p
<     L= chr-US AM= a , PM= p
---
>     L= chr AM= ᏌᎾᎴ , PM= p
>     L= chr-US AM= ᏌᎾᎴ , PM= p
114,119c114,119
<     L= ee AM= a , PM= p
<     L= ee-GH AM= a , PM= p
<     L= ee-TG AM= a , PM= p
<     L= el AM= π , PM= μ
<     L= el-CY AM= π , PM= μ
<     L= el-GR AM= π , PM= μ
---
>     L= ee AM= ŋdi , PM= p
>     L= ee-GH AM= ŋdi , PM= p
>     L= ee-TG AM= ŋdi , PM= p
>     L= el AM= π.μ. , PM= μ.μ.
>     L= el-CY AM= π.μ. , PM= μ.μ.
>     L= el-GR AM= π.μ. , PM= μ.μ.
144c144
<     L= en-GB AM= a , PM= p
---
>     L= en-GB AM= a.m. , PM= p.m.
153c153
<     L= en-IE AM= a , PM= p
---
>     L= en-IE AM= a.m. , PM= p.m.
215c215
<     L= eo AM= a , PM= p
---
>     L= eo AM= atm , PM= ptm
314,315c314,315
<     L= ga AM= a , PM= p
<     L= ga-IE AM= a , PM= p
---
>     L= ga AM= a.m. , PM= p.m.
>     L= ga-IE AM= a.m. , PM= p.m.
318,323c318,323
<     L= gl AM= a , PM= p
<     L= gl-ES AM= a , PM= p
<     L= gsw AM= a , PM= p
<     L= gsw-CH AM= a , PM= p
<     L= gsw-FR AM= a , PM= p
<     L= gsw-LI AM= a , PM= p
---
>     L= gl AM= a.m. , PM= p.m.
>     L= gl-ES AM= a.m. , PM= p.m.
>     L= gsw AM= a , PM= nam.
>     L= gsw-CH AM= a , PM= nam.
>     L= gsw-FR AM= a , PM= nam.
>     L= gsw-LI AM= a , PM= nam.
328,329c328,329
<     L= gv AM= a , PM= p
<     L= gv-IM AM= a , PM= p
---
>     L= gv AM= a.m. , PM= p.m.
>     L= gv-IM AM= a.m. , PM= p.m.
352,353c352,353
<     L= ig AM= a , PM= p
<     L= ig-NG AM= a , PM= p
---
>     L= ig AM= A.M. , PM= P.M.
>     L= ig-NG AM= A.M. , PM= P.M.
356,357c356,357
<     L= is AM= f. , PM= e.
<     L= is-IS AM= f. , PM= e.
---
>     L= is AM= f.h. , PM= e.h.
>     L= is-IS AM= f.h. , PM= e.h.
374,375c374,375
<     L= kde AM= a , PM= p
<     L= kde-TZ AM= a , PM= p
---
>     L= kde AM= Muhi , PM= p
>     L= kde-TZ AM= Muhi , PM= p
409,410c409,410
<     L= kw AM= a , PM= p
<     L= kw-GB AM= a , PM= p
---
>     L= kw AM= a.m. , PM= p.m.
>     L= kw-GB AM= a.m. , PM= p.m.
414,415c414,415
<     L= lag AM= a , PM= p
<     L= lag-TZ AM= a , PM= p
---
>     L= lag AM= TOO , PM= MUU
>     L= lag-TZ AM= TOO , PM= MUU
435,436c435,436
<     L= luy AM= a , PM= p
<     L= luy-KE AM= a , PM= p
---
>     L= luy AM= a.m. , PM= p.m.
>     L= luy-KE AM= a.m. , PM= p.m.
459,465c459,465
<     L= mr AM= स , PM= सं
<     L= mr-IN AM= स , PM= सं
<     L= ms AM= PG , PM= p
<     L= ms-Latn AM= PG , PM= p
<     L= ms-Latn-BN AM= PG , PM= p
<     L= ms-Latn-MY AM= PG , PM= p
<     L= ms-Latn-SG AM= PG , PM= p
---
>     L= mr AM= स , PM= म.उ.
>     L= mr-IN AM= स , PM= म.उ.
>     L= ms AM= PG , PM= PTG
>     L= ms-Latn AM= PG , PM= PTG
>     L= ms-Latn-BN AM= PG , PM= PTG
>     L= ms-Latn-MY AM= PG , PM= PTG
>     L= ms-Latn-SG AM= PG , PM= PTG
474,476c474,476
<     L= nb AM= a , PM= p
<     L= nb-NO AM= a , PM= p
<     L= nb-SJ AM= a , PM= p
---
>     L= nb AM= a.m. , PM= p.m.
>     L= nb-NO AM= a.m. , PM= p.m.
>     L= nb-SJ AM= a.m. , PM= p.m.
490,491c490,491
<     L= nmg AM= a , PM= p
<     L= nmg-CM AM= a , PM= p
---
>     L= nmg AM= maná , PM= kugú
>     L= nmg-CM AM= maná , PM= kugú
515,516c515,516
<     L= ps AM= a , PM= p
<     L= ps-AF AM= a , PM= p
---
>     L= ps AM= غ.م. , PM= غ.و.
>     L= ps-AF AM= غ.م. , PM= غ.و.
527,530c527,530
<     L= qu AM= a , PM= p
<     L= qu-BO AM= a , PM= p
<     L= qu-EC AM= a , PM= p
<     L= qu-PE AM= a , PM= p
---
>     L= qu AM= a.m. , PM= p.m.
>     L= qu-BO AM= a.m. , PM= p.m.
>     L= qu-EC AM= a.m. , PM= p.m.
>     L= qu-PE AM= a.m. , PM= p.m.
572,573c572,573
<     L= si AM= පෙ , PM= ප
<     L= si-LK AM= පෙ , PM= ප
---
>     L= si AM= පෙ , PM= ප.ව.
>     L= si-LK AM= පෙ , PM= ප.ව.
576,577c576,577
<     L= sl AM= d , PM= p
<     L= sl-SI AM= d , PM= p
---
>     L= sl AM= dop. , PM= pop.
>     L= sl-SI AM= dop. , PM= pop.
582,586c582,586
<     L= so AM= a , PM= p
<     L= so-DJ AM= a , PM= p
<     L= so-ET AM= a , PM= p
<     L= so-KE AM= a , PM= p
<     L= so-SO AM= a , PM= p
---
>     L= so AM= sn. , PM= gn.
>     L= so-DJ AM= sn. , PM= gn.
>     L= so-ET AM= sn. , PM= gn.
>     L= so-KE AM= sn. , PM= gn.
>     L= so-SO AM= sn. , PM= gn.
616,617c616,617
<     L= te AM= ఉ , PM= సా
<     L= te-IN AM= ఉ , PM= సా
---
>     L= te AM= [AM] , PM= [PM]
>     L= te-IN AM= [AM] , PM= [PM]

Change-Id: Id87dd3a41b54f4d1e76535c80439e2436346a607
2015-07-09 10:01:31 +00:00
David Friedman
45e73d4238 am 37df186a: am 5c8f69f2: am 8cb9fd84: am 6051cd3e: am 1809f534: Docs: Changes to the "Support" preview page.
* commit '37df186a9e75bfad059554fca186f2ec06c7c28d':
  Docs: Changes to the "Support" preview page.
2015-07-09 07:34:37 +00:00
David Friedman
37df186a9e am 5c8f69f2: am 8cb9fd84: am 6051cd3e: am 1809f534: Docs: Changes to the "Support" preview page.
* commit '5c8f69f23b7d4865e87175f0ec4c49b600fb873a':
  Docs: Changes to the "Support" preview page.
2015-07-09 07:21:47 +00:00
David Friedman
5c8f69f23b am 8cb9fd84: am 6051cd3e: am 1809f534: Docs: Changes to the "Support" preview page.
* commit '8cb9fd846fe2337d56bd9c42fe8fc1586d107875':
  Docs: Changes to the "Support" preview page.
2015-07-09 07:08:42 +00:00
David Friedman
8cb9fd846f am 6051cd3e: am 1809f534: Docs: Changes to the "Support" preview page.
* commit '6051cd3e1b38b9c5b18392ce8c440aaf16412f66':
  Docs: Changes to the "Support" preview page.
2015-07-09 06:56:51 +00:00
David Friedman
6051cd3e1b am 1809f534: Docs: Changes to the "Support" preview page.
* commit '1809f534766b2f1d015806f8f37bcefe8337d7b8':
  Docs: Changes to the "Support" preview page.
2015-07-09 06:42:49 +00:00
David Friedman
1809f53476 Docs: Changes to the "Support" preview page.
Removal of the (now-outdated) non-English versions; corresponding adjustments
to the related TOC file; edits to the English version.

Change-Id: Iec797963f355faf1034911d74d1d9580aaf0bc76
2015-07-08 23:23:25 -07:00
Dirk Dougherty
5747085569 am 7a0b3c9e: am f1d90977: am 872c2482: am 95fc4f45: am 9d5df5ca: Merge "Doc change: add x86 to emulator spec." into mnc-preview-docs
* commit '7a0b3c9e712587c68940e74826f7121b9a187341':
  Doc change: add x86 to emulator spec.
2015-07-09 05:20:58 +00:00
Dirk Dougherty
7a0b3c9e71 am f1d90977: am 872c2482: am 95fc4f45: am 9d5df5ca: Merge "Doc change: add x86 to emulator spec." into mnc-preview-docs
* commit 'f1d909774d7d851b40528f136ed8b2b0f6ec1172':
  Doc change: add x86 to emulator spec.
2015-07-09 05:07:43 +00:00
Dirk Dougherty
f1d909774d am 872c2482: am 95fc4f45: am 9d5df5ca: Merge "Doc change: add x86 to emulator spec." into mnc-preview-docs
* commit '872c24828ff9e69e2197ea42f72d7537246d0d46':
  Doc change: add x86 to emulator spec.
2015-07-09 04:53:06 +00:00
David Friedman
e15e72fa91 am eba241dd: am 587f9fb2: am 15d1c1c9: am 064f8b68: am dde5e263: Merge "Docs: Fixes to the quick-view wrapper on non-English "about lollipop" pages." into mnc-preview-docs
* commit 'eba241ddf692c394b2c4ff7a2cb8fbafb37fd01d':
  Docs: Fixes to the quick-view wrapper on non-English "about lollipop" pages.
2015-07-09 04:38:11 +00:00
Dirk Dougherty
515d950fb1 am 4141bb03: am 7ed87b8e: am 492123d5: am 119683d1: am 0ffd7158: Merge "Doc change: minor updates to KIs and AFW behavior changes." into mnc-preview-docs
* commit '4141bb03eb721701a3fb9b9836518295707e58ca':
  Doc change: minor updates to KIs and AFW behavior changes.
2015-07-09 04:38:04 +00:00
David Friedman
eba241ddf6 am 587f9fb2: am 15d1c1c9: am 064f8b68: am dde5e263: Merge "Docs: Fixes to the quick-view wrapper on non-English "about lollipop" pages." into mnc-preview-docs
* commit '587f9fb2eb009af2e3597c7cd5995bfa3fbe6502':
  Docs: Fixes to the quick-view wrapper on non-English "about lollipop" pages.
2015-07-09 04:25:01 +00:00
Dirk Dougherty
4141bb03eb am 7ed87b8e: am 492123d5: am 119683d1: am 0ffd7158: Merge "Doc change: minor updates to KIs and AFW behavior changes." into mnc-preview-docs
* commit '7ed87b8eb7915de0f556f863b49bd215119c0df7':
  Doc change: minor updates to KIs and AFW behavior changes.
2015-07-09 04:24:57 +00:00
Dirk Dougherty
872c24828f am 95fc4f45: am 9d5df5ca: Merge "Doc change: add x86 to emulator spec." into mnc-preview-docs
* commit '95fc4f45deb05318d14ce9a27ad8657a94eee4de':
  Doc change: add x86 to emulator spec.
2015-07-09 04:22:28 +00:00
David Friedman
587f9fb2eb am 15d1c1c9: am 064f8b68: am dde5e263: Merge "Docs: Fixes to the quick-view wrapper on non-English "about lollipop" pages." into mnc-preview-docs
* commit '15d1c1c95b3d8f25aad81dfdc2fc55028968242e':
  Docs: Fixes to the quick-view wrapper on non-English "about lollipop" pages.
2015-07-09 04:09:35 +00:00
Dirk Dougherty
7ed87b8eb7 am 492123d5: am 119683d1: am 0ffd7158: Merge "Doc change: minor updates to KIs and AFW behavior changes." into mnc-preview-docs
* commit '492123d5e672ddab8a6777981a62a24206622ae7':
  Doc change: minor updates to KIs and AFW behavior changes.
2015-07-09 04:09:32 +00:00
Jim Miller
45ff18ee83 am b76bbf1b: am 253129f9: am 748bc36f: Remove "final" qualifier from AuthenticationResult
* commit 'b76bbf1b94853917e23668376927587b93a70b56':
  Remove "final" qualifier from AuthenticationResult
2015-07-09 04:02:14 +00:00
Robert Greenwalt
5a38c8e964 am 3d345232: am 031b9477: am 348988c5: Merge "Fix permissions on TelephonyManager" into mnc-dev
* commit '3d34523200cb69f8c13a7a99ad5429edbf0bcc12':
  Fix permissions on TelephonyManager
2015-07-09 04:02:08 +00:00
David Friedman
15d1c1c95b am 064f8b68: am dde5e263: Merge "Docs: Fixes to the quick-view wrapper on non-English "about lollipop" pages." into mnc-preview-docs
* commit '064f8b68f9e2404426ba37ce697b52dba6418810':
  Docs: Fixes to the quick-view wrapper on non-English "about lollipop" pages.
2015-07-09 03:56:07 +00:00
Dirk Dougherty
492123d5e6 am 119683d1: am 0ffd7158: Merge "Doc change: minor updates to KIs and AFW behavior changes." into mnc-preview-docs
* commit '119683d12751ae657576d45448cd6f83478a0b55':
  Doc change: minor updates to KIs and AFW behavior changes.
2015-07-09 03:56:01 +00:00
Dirk Dougherty
95fc4f45de am 9d5df5ca: Merge "Doc change: add x86 to emulator spec." into mnc-preview-docs
* commit '9d5df5ca0491dcb2309c81ec497137f5d7c7a602':
  Doc change: add x86 to emulator spec.
2015-07-09 03:54:37 +00:00
Jim Miller
b76bbf1b94 am 253129f9: am 748bc36f: Remove "final" qualifier from AuthenticationResult
* commit '253129f90f1fcbf856ad4ec91855713e774e9cb4':
  Remove "final" qualifier from AuthenticationResult
2015-07-09 03:49:41 +00:00
Robert Greenwalt
3d34523200 am 031b9477: am 348988c5: Merge "Fix permissions on TelephonyManager" into mnc-dev
* commit '031b9477663e0974fbc765795ccd7694a0430b5a':
  Fix permissions on TelephonyManager
2015-07-09 03:49:38 +00:00
Robert Greenwalt
8d48252b80 Revive NetworkInfo's SUSPENDED state.
This got lost in the multinetwork work for L.  It means
that if telephony stops having the ability to pass packets for a while
the rest of the platform doesn't know.

Telephony enters the suspended state if it enters a telephony call
while using certain radio access technologies, or if it switches to
one of those RATs while in a call.  It also can enter this state if
it temporarily loses contact with the network - the modem will
not report the loss of the data call for an indeterminant time in
the hope that regaining the network will restore the connection
without harm to any ongoing ip layer interactions.  For example
passing through a tunnel or taking an elevator trip may use this
mechanism.

bug: 19637156
Change-Id: If9fde68175e8561c19323c81fbfcb02a6e5a00fb
2015-07-08 20:42:55 -07:00
David Friedman
064f8b68f9 am dde5e263: Merge "Docs: Fixes to the quick-view wrapper on non-English "about lollipop" pages." into mnc-preview-docs
* commit 'dde5e2635588b1949fbda31ef096b0ee838ae761':
  Docs: Fixes to the quick-view wrapper on non-English "about lollipop" pages.
2015-07-09 03:39:05 +00:00
Dirk Dougherty
119683d127 am 0ffd7158: Merge "Doc change: minor updates to KIs and AFW behavior changes." into mnc-preview-docs
* commit '0ffd7158b2b6db8c3740c7bdaa55b39cede1c3fb':
  Doc change: minor updates to KIs and AFW behavior changes.
2015-07-09 03:39:01 +00:00
Jim Miller
253129f90f am 748bc36f: Remove "final" qualifier from AuthenticationResult
* commit '748bc36f2eebfdc67520c5025b48fefdfd8d7c01':
  Remove "final" qualifier from AuthenticationResult
2015-07-09 03:34:54 +00:00
Robert Greenwalt
031b947766 am 348988c5: Merge "Fix permissions on TelephonyManager" into mnc-dev
* commit '348988c5704a5a6eb6aec093e295c2d9f00ee33c':
  Fix permissions on TelephonyManager
2015-07-09 03:34:47 +00:00
Dirk Dougherty
9d5df5ca04 Merge "Doc change: add x86 to emulator spec." into mnc-preview-docs 2015-07-09 03:25:40 +00:00
Dirk Dougherty
4e1cc12004 Doc change: add x86 to emulator spec.
Change-Id: I86209cf29f6fd2e0e73106cd0ba2aa81e54bcde1
2015-07-08 20:23:04 -07:00