196961 Commits

Author SHA1 Message Date
Alan Viverette
322fd93f88 Merge "Add missing break in AccessibilityEvent.eventTypeToString()" into mnc-dev 2015-07-09 17:17:37 +00:00
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
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
Paul Jensen
49e3edff51 Add android.net.CaptivePortal class for captive-portal-handling-app callbacks
This new class replaces the awkward string token and ConnectivityManager APIs
used by apps handling captive portals.

Bug:21343774
Change-Id: I1a2c69edb17322715bf8422bb4216b0ea60bfd59
2015-07-09 10:47:34 -04:00
Jason Monk
7150d7fa35 Remove data icon for WFC
Bug: 22095746
Change-Id: I0ca8420c2d88425cbb6da5fcc02c083355e933e9
2015-07-09 10:14:12 -04: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
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
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
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
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
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
David Friedman
dde5e26355 Merge "Docs: Fixes to the quick-view wrapper on non-English "about lollipop" pages." into mnc-preview-docs 2015-07-09 03:21:47 +00:00
Jim Miller
748bc36f2e Remove "final" qualifier from AuthenticationResult
This allows mock implementations to be created for testing
purposes.

Fixes bug 22362080

Change-Id: I5ff002c077d22b1338f2f4e394ad19827bb2ae9c
2015-07-09 03:19:31 +00:00
Robert Greenwalt
348988c570 Merge "Fix permissions on TelephonyManager" into mnc-dev 2015-07-09 03:19:26 +00:00
Dirk Dougherty
0ffd7158b2 Merge "Doc change: minor updates to KIs and AFW behavior changes." into mnc-preview-docs 2015-07-09 03:14:47 +00:00
Dirk Dougherty
ecf63e4d54 Doc change: minor updates to KIs and AFW behavior changes.
Change-Id: If1af0f85593db48b241d81dcb6df9d4a5c703105
2015-07-08 20:10:49 -07:00
Sanket Padawe
58295e71d2 Merge "Add Null checks while processing pairing cancel intent" into mnc-dev 2015-07-09 01:16:03 +00:00
Adam Lesinski
7fb1655a89 Merge "BatteryStats: Fail gracefully on corrupt battery stats" into mnc-dev 2015-07-09 01:15:15 +00:00
Svet Ganov
ad3b297557 Add an API for apps to query if a permisison is denied by policy.
bug:22177216

Change-Id: I32227f55097fae997f33743fd1eee06cb18f47f1
2015-07-08 18:12:58 -07:00
Sanket Padawe
4d08a485db Add Null checks while processing pairing cancel intent
Use case: Exception while handling pairing cancel
          Intent received
1. Initiate pairing from DUT to remote
2. Power off DUT after getting pairing popup

Root Cause:Crash observed in settings application

Change-Id: Ia05fe196ecf6a1d4ec26f85b0cf984e23089c728
Fix: Fixed by adding Null check in PairingCancelHandler
2015-07-09 01:02:03 +00:00
Robert Greenwalt
de335a7dc4 Merge "Fix Permission Typo." into mnc-dev 2015-07-09 00:36:32 +00:00
Adam Lesinski
9ae9cba020 BatteryStats: Fail gracefully on corrupt battery stats
Bug:22328963
Change-Id: Id0b4c6334706e58483d5fdfd2c1137bfb821c409
2015-07-08 17:35:42 -07:00
Christopher Tate
01e186437f Add a mechanism for products to specify default active app linkages
We now have a new tag type in the existing SystemConfig XML files:

    <app-link package="..." />

Packages mentioned here are treated as though the user had instructed
the system to always open the app rather than a browser when touching
an HTTP/HTTPs URL that is handled by the app.  This default state can
of course still be turned down by the user if they choose.

Bug 21595872

Change-Id: I2824064a891bba3867ee86f81d609d22e83aef7a
2015-07-08 17:27:11 -07:00
Mady Mellor
84005b4049 Merge "Use hint text to position handle / floating tool bar popups" into mnc-dev 2015-07-09 00:06:13 +00:00
Svetoslav
6638c18263 Merge "Fix reset permissions on clear data and package uninstall." into mnc-dev 2015-07-08 23:58:01 +00:00
Robert Greenwalt
0f1ed304c1 Fix Permission Typo.
There is no 'd' in privilege.  And there is no spell checking in Manifests.

bug:22358954
Change-Id: Ia122f51a81dc35760f277e23fe0f5a6d3d739457
2015-07-08 16:57:45 -07:00
Svetoslav
4a5f4a2bc7 Fix reset permissions on clear data and package uninstall.
If the user clears data for an app we reset the permission but
only the changes made by the user. We do not modify syste or
policy flags and also ensure the permission that were granted
by default are granted after the data wipe. This is the same
as starting with a clean slate.

If the package whose data is cleared is a part of a shared user
we resent to initial state only the permissions that the cleared
package contributed. Hence, if another package also declared the
permission as used we do not clear the permission state as it is
still in use.

When a package is deleted for a user but still present for another
user we reset its permissions to their inital state follwoing
above described strategy.

Lastly when a preinstalled package wtih an upgrade is diabled
(triggers upgrade uninstall) and this package is a part of a
shared user, we do not drop permission state (grants and flags)
for permissions used by the shadowed system package. This ensures
that we do not drop runtime permission state (such state is
default grants and user changes).i

bug:22248525

Change-Id: I3a3007476d2cb9f4ff824e1e137a6e1a4d04408b
2015-07-08 16:52:42 -07:00
Svet Ganov
9b84b5c513 Merge "Update storage group icon" into mnc-dev 2015-07-08 23:51:21 +00:00
Jack Yu
6b7a07848b Merge "Grant SMS permissions to Cell Broadcast receiver which emergency/non-emergency broadcast messages from the network." into mnc-dev 2015-07-08 23:46:36 +00:00
Amith Yamasani
705ba96063 Merge "Qualify the uid with the userId when granting permissions" into mnc-dev 2015-07-08 23:44:55 +00:00
Wale Ogunwale
dad62b9f99 Merge "Finish already paused activity if it should be finished after pausing" into mnc-dev 2015-07-08 23:34:31 +00:00
Jeff Sharkey
9f4c4ee666 Merge "Fix crash looping SystemUI." into mnc-dev 2015-07-08 23:14:11 +00:00
Jeff Sharkey
a80d264be6 Fix crash looping SystemUI.
Bug: 22358954
Change-Id: Ie8539d7f866ae722edd071f6b20e8f8881d82434
2015-07-08 16:11:55 -07:00
Selim Cinek
9201385f2e Merge "Cleaned up the clipping logic for the dismiss motion." into mnc-dev 2015-07-08 23:08:48 +00:00
Ian Pedowitz
224f0369ca Merge "com.android.mms is no more, so removing from default_sms_application" into mnc-dev 2015-07-08 23:01:19 +00:00
Ian Pedowitz
de8d3a53a8 com.android.mms is no more, so removing from default_sms_application
Fixing a minor comment typo

Bug: 22333078
Change-Id: Id2df5805567967fcf5544dca0264e130b46b4858
2015-07-08 23:00:22 +00:00