Commit Graph

54336 Commits

Author SHA1 Message Date
Jorim Jaggi
46e30763df am 5175b3c9: am 9acf475c: am 35094376: am 3cc5c24b: Merge "Fix assist for hardware long-press" into mnc-dev
* commit '5175b3c9923f5eaf5eafa01798966f8711ce9547':
  Fix assist for hardware long-press
2015-07-09 20:16:30 +00:00
Julia Reynolds
2ebd9a9cfc am 17364a23: am 07ea25a7: am 68e4d688: am 279678e1: Merge "Show a default icon for permissions that lack a group." into mnc-dev
* commit '17364a23929bdfeaa9bda3cbf5c71519268b1a3a':
  Show a default icon for permissions that lack a group.
2015-07-09 19:58:00 +00:00
Jorim Jaggi
9acf475c6c am 35094376: am 3cc5c24b: Merge "Fix assist for hardware long-press" into mnc-dev
* commit '35094376726c3a0d4b6fa73ef836f733fad39ae9':
  Fix assist for hardware long-press
2015-07-09 19:46:46 +00:00
Julia Reynolds
07ea25a7d1 am 68e4d688: am 279678e1: Merge "Show a default icon for permissions that lack a group." into mnc-dev
* commit '68e4d688ba4c4b4bd23a8acc8c807d2f8b446342':
  Show a default icon for permissions that lack a group.
2015-07-09 19:25:43 +00:00
Jorim Jaggi
3cc5c24b83 Merge "Fix assist for hardware long-press" into mnc-dev 2015-07-09 19:19:05 +00:00
Julia Reynolds
279678e1ff Merge "Show a default icon for permissions that lack a group." into mnc-dev 2015-07-09 18:58:13 +00:00
Julia Reynolds
d1af446feb Show a default icon for permissions that lack a group.
Bug: 22229417
Change-Id: I82e12504adcca5d3fb6902109a3d7075a4739843
2015-07-09 14:56:46 -04:00
Alan Viverette
b5491bcc2f am 6bd2e985: am 5f3b4eea: am ec12d8ea: am 322fd93f: Merge "Add missing break in AccessibilityEvent.eventTypeToString()" into mnc-dev
* commit '6bd2e98584db1416a369760d02a4c0f18eea516d':
  Add missing break in AccessibilityEvent.eventTypeToString()
2015-07-09 18:50:31 +00:00
Robert Greenwalt
c3ed104c25 am 49a8822d: am 8d6620bd: am 30d822e2: am b091695b: Merge "Revive NetworkInfo\'s SUSPENDED state." into mnc-dev
* commit '49a8822db9dcf2bc2b11a6a44179b361c1f8b86b':
  Revive NetworkInfo's SUSPENDED state.
2015-07-09 18:50:16 +00:00
Mikhail Naganov
c39fb7e7a2 am 64a57dc1: am 4204ed96: am fa85a888: am abb8dc97: Merge "Enhance documentation of WebSettings.WebSettings method" into mnc-dev
* commit '64a57dc1b3caffc0fedbb670f0e93b3a6ef58176':
  Enhance documentation of WebSettings.WebSettings method
2015-07-09 17:59:37 +00:00
Alan Viverette
5f3b4eeae1 am ec12d8ea: am 322fd93f: Merge "Add missing break in AccessibilityEvent.eventTypeToString()" into mnc-dev
* commit 'ec12d8ea174b63442a901f64bf147d79c68d21e7':
  Add missing break in AccessibilityEvent.eventTypeToString()
2015-07-09 17:43:18 +00:00
Robert Greenwalt
8d6620bd1c am 30d822e2: am b091695b: Merge "Revive NetworkInfo\'s SUSPENDED state." into mnc-dev
* commit '30d822e2bdfde4360fc072f7f4ee16c83ac9dcc8':
  Revive NetworkInfo's SUSPENDED state.
2015-07-09 17:43:06 +00:00
Mikhail Naganov
4204ed96bf am fa85a888: am abb8dc97: Merge "Enhance documentation of WebSettings.WebSettings method" into mnc-dev
* commit 'fa85a888a068da9bdd8dcc0d6ebcc675146c45cb':
  Enhance documentation of WebSettings.WebSettings method
2015-07-09 17:27:02 +00:00
Alan Viverette
322fd93f88 Merge "Add missing break in AccessibilityEvent.eventTypeToString()" into mnc-dev 2015-07-09 17:17:37 +00:00
Robert Greenwalt
b091695bd9 Merge "Revive NetworkInfo's SUSPENDED state." into mnc-dev 2015-07-09 17:09:17 +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
Neil Fuller
f74d27af87 am b27c379b: am 2ca4f73e: Merge "Switch LocalSocketImpl.accept() over to using Os.accept()"
* commit 'b27c379b259d42a1e90eb4b4d79abc2426def731':
  Switch LocalSocketImpl.accept() over to using Os.accept()
2015-07-09 11:38:36 +00:00
Narayan Kamath
a11c2f8f6c am 49df8dff: am af7cf1c4: am 1601c604: am 14b50394: Reduce overly aggressive use of narrowAm / narrowPm.
* commit '49df8dff5f7d095af3055ae7dc5ad25f7fc3ad89':
  Reduce overly aggressive use of narrowAm / narrowPm.
2015-07-09 10:57:21 +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
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
Neil Fuller
c1eaeb9337 Switch LocalSocketImpl.accept() over to using Os.accept()
Bug: 3106438
Change-Id: I3b4a07cc2283c3cfdbaf3d2460f37264f67690e3
2015-07-09 09:45:01 +00:00
Jim Miller
4b3bd02a14 am 45ff18ee: am b76bbf1b: am 253129f9: am 748bc36f: Remove "final" qualifier from AuthenticationResult
* commit '45ff18ee83e6bcc2eed42b24cfb74dc9ba507bb3':
  Remove "final" qualifier from AuthenticationResult
2015-07-09 04:16:12 +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
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
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
Adam Lesinski
8e82c794bb am 3e2b53ff: am 1ad61b33: am 1549adb4: am 7fb1655a: Merge "BatteryStats: Fail gracefully on corrupt battery stats" into mnc-dev
* commit '3e2b53ff6981b7ef857cb28c5b2ddb3bc71002b9':
  BatteryStats: Fail gracefully on corrupt battery stats
2015-07-09 02:09:26 +00:00
Filip Gruszczynski
5e16aa5164 am b52df916: am d705f355: am 45eb3ea6: Revert "Fix NPE when requesting outsets for detached view."
* commit 'b52df916207ac831b9b7e525fd967a4796a39a3a':
  Revert "Fix NPE when requesting outsets for detached view."
2015-07-09 01:49:24 +00:00
Adam Lesinski
1ad61b3314 am 1549adb4: am 7fb1655a: Merge "BatteryStats: Fail gracefully on corrupt battery stats" into mnc-dev
* commit '1549adb4eaef28ef41ebd063df1e339de035e19d':
  BatteryStats: Fail gracefully on corrupt battery stats
2015-07-09 01:42:15 +00:00
Filip Gruszczynski
d705f35568 am 45eb3ea6: Revert "Fix NPE when requesting outsets for detached view."
* commit '45eb3ea667dac8d97a91781f01875148bacfe74c':
  Revert "Fix NPE when requesting outsets for detached view."
2015-07-09 01:22:04 +00:00
Adam Lesinski
7fb1655a89 Merge "BatteryStats: Fail gracefully on corrupt battery stats" into mnc-dev 2015-07-09 01:15:15 +00:00
Mady Mellor
d84ab3eab0 am b2ff3bd4: am 88e76d88: am e46094c4: am 84005b40: Merge "Use hint text to position handle / floating tool bar popups" into mnc-dev
* commit 'b2ff3bd42b06ea8c1a95b830f96d6ffee92d1a3a':
  Use hint text to position handle / floating tool bar popups
2015-07-09 01:14:50 +00:00
Svetoslav
122350fca7 am 843d7216: am 353835e1: am c88dec32: am 6638c182: Merge "Fix reset permissions on clear data and package uninstall." into mnc-dev
* commit '843d721647bf39f4f819b9decc090a9196c1f706':
  Fix reset permissions on clear data and package uninstall.
2015-07-09 01:14:44 +00:00
Filip Gruszczynski
45eb3ea667 Revert "Fix NPE when requesting outsets for detached view."
This reverts commit b010291ace.

Change-Id: If86ce92daac9e80d5fc2e9f707d937e7c6e91a74
2015-07-09 01:06:40 +00:00
Mady Mellor
88e76d88d7 am e46094c4: am 84005b40: Merge "Use hint text to position handle / floating tool bar popups" into mnc-dev
* commit 'e46094c4388412f996292af73acb0b9fda99ffcd':
  Use hint text to position handle / floating tool bar popups
2015-07-09 00:47:25 +00:00
Svetoslav
353835e12d am c88dec32: am 6638c182: Merge "Fix reset permissions on clear data and package uninstall." into mnc-dev
* commit 'c88dec321b666092735263dbb247c56e45186abf':
  Fix reset permissions on clear data and package uninstall.
2015-07-09 00:47:20 +00:00
Filip Gruszczynski
93c4f91594 am c72a5821: am 886fd2f5: am b010291a: Fix NPE when requesting outsets for detached view.
* commit 'c72a582138c1db297c662e5f83ce6a2e97f8bf69':
  Fix NPE when requesting outsets for detached view.
2015-07-09 00:45:37 +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
Filip Gruszczynski
886fd2f5a0 am b010291a: Fix NPE when requesting outsets for detached view.
* commit 'b010291ace13947fcc76b1a64eaa67880e15f0a6':
  Fix NPE when requesting outsets for detached view.
2015-07-09 00:15:25 +00: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
Sasha Levitskiy
6889cc64cd am 70407ff4: am 1022fa9a: am ce3da983: am 12328ef4: Merge "Fingerprint: Add post enroll interface." into mnc-dev
* commit '70407ff418d54cbcd62f59334c258f4781994b20':
  Fingerprint: Add post enroll interface.
2015-07-08 23:53:20 +00: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
Filip Gruszczynski
b010291ace Fix NPE when requesting outsets for detached view.
Outsets are used during measure/layout pass, but this can be called on a
view that is not currently attached.

Bug: 21602590
Change-Id: I23e3acc45ca4bf7684d8913f839e29e8e9e94d78
(cherry picked from commit e660d4e96a)
2015-07-08 23:22:36 +00:00
Sasha Levitskiy
12328ef422 Merge "Fingerprint: Add post enroll interface." into mnc-dev 2015-07-08 22:59:51 +00:00
Jeff Sharkey
b64813bdf0 am 093be69c: am f3d73162: am 46552cff: am 9d587a97: Merge changes I9971c466,Ib42474fd into mnc-dev
* commit '093be69c4168988938d276d31625515f641a170b':
  Kill MediaProvider during drastic changes.
  Use best volume description for MTP.
2015-07-08 22:44:24 +00:00
Jeff Sharkey
608114f966 am e232afca: am 95661575: am 612aac4e: am c66b90fe: Merge "Generate stable MTP storage IDs." into mnc-dev
* commit 'e232afca8240e3b8bbbd9696a210aed5b14b9b79':
  Generate stable MTP storage IDs.
2015-07-08 22:44:19 +00:00
Sasha Levitskiy
e0943cf566 Fingerprint: Add post enroll interface.
Bug: 22007124
Change-Id: I9b74edd8e34eaf9ab559b6dc20030a95fa3ce321
Signed-off-by: Sasha Levitskiy <sanek@google.com>
2015-07-08 15:38:07 -07:00
Jorim Jaggi
165ce066b7 Fix assist for hardware long-press
Activating the assistant will now route through SysUI, so
we have the logic whether to start an activity or to start a voice
interaction session in one single place.

Bug: 22201770
Change-Id: I0f4699533aea2a1e595ee25a844434c82f548c01
2015-07-08 22:26:24 +00:00
Jeff Sharkey
9d587a97b9 Merge changes I9971c466,Ib42474fd into mnc-dev
* changes:
  Kill MediaProvider during drastic changes.
  Use best volume description for MTP.
2015-07-08 21:55:54 +00:00