OSDN Git Service
Jeff Brown [Thu, 9 Jul 2015 20:10:26 +0000 (20:10 +0000)]
am
c1aebfa0: Merge "Clean up USB Manager and fix ADB." into mnc-dev
* commit '
c1aebfa02c393471fb344c3a94ee2ae62bb78f93':
Clean up USB Manager and fix ADB.
Raph Levien [Thu, 9 Jul 2015 20:10:18 +0000 (20:10 +0000)]
am
968f9fdf: Merge "Slightly more precise RTL check in BoringLayout.isBoring()" into mnc-dev
* commit '
968f9fdf8b2042b4d7b408f4b2a9db5008eaca6e':
Slightly more precise RTL check in BoringLayout.isBoring()
Jeff Brown [Thu, 9 Jul 2015 20:03:26 +0000 (20:03 +0000)]
Merge "Clean up USB Manager and fix ADB." into mnc-dev
Raph Levien [Thu, 9 Jul 2015 19:56:18 +0000 (19:56 +0000)]
Merge "Slightly more precise RTL check in BoringLayout.isBoring()" into mnc-dev
Jeff Brown [Wed, 1 Jul 2015 00:57:12 +0000 (17:57 -0700)]
Clean up USB Manager and fix ADB.
Moved functions which parse the USB functions list into one common
place on UsbManager.
Deleted the no longer supported USB_FUNCTION_MASS_STORAGE.
Ensured that the UserManager.DISALLOW_USB_FILE_TRANSFER rule is
consistently applied during user switch and when changing the
current USB functions and make sure it only affects MTP and PTP.
Collapsed the boot completed and user switched receivers to
ensure consistent ordering of side-effects.
Validate the list of functions passed to setCurrentFunction() so
that the separation of concerns is clearer. It was somewhat
ambiguous as to whether functions such as ADB could / should be
enabled through that interface. Improved the docs for clarity.
Fixed a bunch of broken stuff related to the USB config
persistent property (list of default functions) that could cause
ADB and other functions to not work at all. Added new failsafes
to ensure that we reliably get back into a happy state.
Bug:
22206076
Change-Id: I02915ddfce7193a8f67a14f0d76bab22fc575dfa
Raph Levien [Thu, 9 Jul 2015 19:36:31 +0000 (12:36 -0700)]
Slightly more precise RTL check in BoringLayout.isBoring()
This patch refines the crude check for potential RTL characters, based
on ranges containing RTL scripts and format characters that affect
bidi. This will make it much less likely that a StaticLayout will be
chosen instead of a BoringLayout.
Bug:
22328919
Change-Id: I9a0ed9b3f3373069052de21c836b3372f175430f
Jorim Jaggi [Thu, 9 Jul 2015 19:32:50 +0000 (19:32 +0000)]
am
3cc5c24b: Merge "Fix assist for hardware long-press" into mnc-dev
* commit '
3cc5c24b83edaab66c97b161e25ff0bd93b3e1b4':
Fix assist for hardware long-press
Jorim Jaggi [Thu, 9 Jul 2015 19:19:04 +0000 (19:19 +0000)]
Merge "Fix assist for hardware long-press" into mnc-dev
Julia Reynolds [Thu, 9 Jul 2015 19:09:01 +0000 (19:09 +0000)]
am
279678e1: Merge "Show a default icon for permissions that lack a group." into mnc-dev
* commit '
279678e1ffc72090a56a1ccd7f782d3c7c0b228f':
Show a default icon for permissions that lack a group.
Jason Monk [Thu, 9 Jul 2015 19:08:52 +0000 (19:08 +0000)]
am
58599104: Merge "Remove data icon for WFC" into mnc-dev
* commit '
5859910463df29324df868f30e0ff66440cf161f':
Remove data icon for WFC
Jason Monk [Thu, 9 Jul 2015 19:08:44 +0000 (19:08 +0000)]
am
8969817a: Merge "Fix roaming icon when not default signal" into mnc-dev
* commit '
8969817a83e2ed5f28f67bd5f7f4de14a5455139':
Fix roaming icon when not default signal
Julia Reynolds [Thu, 9 Jul 2015 18:58:12 +0000 (18:58 +0000)]
Merge "Show a default icon for permissions that lack a group." into mnc-dev
Julia Reynolds [Wed, 8 Jul 2015 15:12:28 +0000 (11:12 -0400)]
Show a default icon for permissions that lack a group.
Bug:
22229417
Change-Id: I82e12504adcca5d3fb6902109a3d7075a4739843
Jason Monk [Thu, 9 Jul 2015 18:55:00 +0000 (18:55 +0000)]
Merge "Remove data icon for WFC" into mnc-dev
Jason Monk [Thu, 9 Jul 2015 18:54:58 +0000 (18:54 +0000)]
Merge "Fix roaming icon when not default signal" into mnc-dev
Amith Yamasani [Thu, 9 Jul 2015 18:10:10 +0000 (18:10 +0000)]
am
5d21f416: Merge "Dispatch onUserSwitched callbacks on handler thread" into mnc-dev
* commit '
5d21f4168e7e8625427eb2210e59b30bff5b3b85':
Dispatch onUserSwitched callbacks on handler thread
Amith Yamasani [Thu, 9 Jul 2015 17:56:48 +0000 (17:56 +0000)]
Merge "Dispatch onUserSwitched callbacks on handler thread" into mnc-dev
Narayan Kamath [Thu, 9 Jul 2015 17:51:05 +0000 (17:51 +0000)]
am
f17d77cd: am
43a2aca4: Merge "Remove @ToBeFixed from knowntags."
* commit '
f17d77cd9d4cc4ce5086ad45cfcc822d46951b99':
Remove @ToBeFixed from knowntags.
Amith Yamasani [Wed, 8 Jul 2015 22:50:13 +0000 (15:50 -0700)]
Dispatch onUserSwitched callbacks on handler thread
This avoids multiple threads calling beginBroadcast on the observers
list.
Bug:
22339693
Change-Id: I78a154415ccd17c9460b25589d46dadcdb850941
Narayan Kamath [Thu, 9 Jul 2015 17:38:46 +0000 (17:38 +0000)]
am
43a2aca4: Merge "Remove @ToBeFixed from knowntags."
* commit '
43a2aca4c279d3db8abdf4692249134fdd69bd96':
Remove @ToBeFixed from knowntags.
Christopher Tate [Thu, 9 Jul 2015 17:25:52 +0000 (17:25 +0000)]
am
607a040d: Merge "Add a mechanism for products to specify default active app linkages" into mnc-dev
* commit '
607a040dae1b8fde0f9ea9f1723e0721f891f3dd':
Add a mechanism for products to specify default active app linkages
Alan Viverette [Thu, 9 Jul 2015 17:25:43 +0000 (17:25 +0000)]
am
322fd93f: Merge "Add missing break in AccessibilityEvent.eventTypeToString()" into mnc-dev
* commit '
322fd93f888a0b42ee860398debe04b84b8b223f':
Add missing break in AccessibilityEvent.eventTypeToString()
Fyodor Kupolov [Thu, 9 Jul 2015 17:25:34 +0000 (17:25 +0000)]
am
3f511882: Merge "Check location permission/appop in getScanResults" into mnc-dev
* commit '
3f51188294a910c8985c778c7d86a909e6cbee25':
Check location permission/appop in getScanResults
Robert Greenwalt [Thu, 9 Jul 2015 17:25:27 +0000 (17:25 +0000)]
am
b091695b: Merge "Revive NetworkInfo\'s SUSPENDED state." into mnc-dev
* commit '
b091695bd9b9a87fc637751cfa2b52c8b72ce487':
Revive NetworkInfo's SUSPENDED state.
Narayan Kamath [Thu, 9 Jul 2015 17:22:13 +0000 (17:22 +0000)]
Merge "Remove @ToBeFixed from knowntags."
Christopher Tate [Thu, 9 Jul 2015 17:17:58 +0000 (17:17 +0000)]
Merge "Add a mechanism for products to specify default active app linkages" into mnc-dev
Alan Viverette [Thu, 9 Jul 2015 17:17:35 +0000 (17:17 +0000)]
Merge "Add missing break in AccessibilityEvent.eventTypeToString()" into mnc-dev
Fyodor Kupolov [Thu, 9 Jul 2015 17:14:14 +0000 (17:14 +0000)]
Merge "Check location permission/appop in getScanResults" into mnc-dev
Robert Greenwalt [Thu, 9 Jul 2015 17:09:15 +0000 (17:09 +0000)]
Merge "Revive NetworkInfo's SUSPENDED state." into mnc-dev
Jeff Sharkey [Thu, 9 Jul 2015 17:07:40 +0000 (17:07 +0000)]
am
ee4a534b: Merge "Timeout when partitioning takes too long." into mnc-dev
* commit '
ee4a534b7bbe95fa913473e3288787fcd1050c49':
Timeout when partitioning takes too long.
Jeff Sharkey [Thu, 9 Jul 2015 17:07:31 +0000 (17:07 +0000)]
am
a419076e: Merge "Add grant flag support to "install-create" verb." into mnc-dev
* commit '
a419076eab4ebf54186c5801216f611e080edf5f':
Add grant flag support to "install-create" verb.
Mikhail Naganov [Thu, 9 Jul 2015 17:07:24 +0000 (17:07 +0000)]
am
abb8dc97: Merge "Enhance documentation of WebSettings.WebSettings method" into mnc-dev
* commit '
abb8dc97586cc15fa16bab7dd80ffe02a379550f':
Enhance documentation of WebSettings.WebSettings method
Jeff Sharkey [Thu, 9 Jul 2015 16:59:14 +0000 (16:59 +0000)]
Merge "Timeout when partitioning takes too long." into mnc-dev
Jeff Sharkey [Thu, 9 Jul 2015 16:58:45 +0000 (16:58 +0000)]
Merge "Add grant flag support to "install-create" verb." into mnc-dev
Narayan Kamath [Thu, 9 Jul 2015 16:54:45 +0000 (17:54 +0100)]
Remove @ToBeFixed from knowntags.
It's used nowhere and will be deleted shortly.
Change-Id: Ie87f16cd060445c0e0ccac4e9a192ca266c92851
Mikhail Naganov [Thu, 9 Jul 2015 16:53:35 +0000 (16:53 +0000)]
Merge "Enhance documentation of WebSettings.WebSettings method" into mnc-dev
Alan Viverette [Thu, 9 Jul 2015 16:51:46 +0000 (09:51 -0700)]
Add missing break in AccessibilityEvent.eventTypeToString()
Bug:
22331852
Change-Id: I6f75dde0fb29715d05ef8e8b0e16c3a5a2b9d5e8
Jeff Sharkey [Thu, 9 Jul 2015 16:45:36 +0000 (09:45 -0700)]
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
Jeff Sharkey [Thu, 9 Jul 2015 16:16:04 +0000 (09:16 -0700)]
Add grant flag support to "install-create" verb.
This matches the "install" behavior.
Bug:
22331569
Change-Id: I07bfe067bd4be01fc92126750b0ff25a5c5ba5c9
Jason Monk [Thu, 9 Jul 2015 14:14:12 +0000 (10:14 -0400)]
Remove data icon for WFC
Bug:
22095746
Change-Id: I0ca8420c2d88425cbb6da5fcc02c083355e933e9
Neil Fuller [Thu, 9 Jul 2015 11:44:01 +0000 (11:44 +0000)]
am
b27c379b: am
2ca4f73e: Merge "Switch LocalSocketImpl.accept() over to using Os.accept()"
* commit '
b27c379b259d42a1e90eb4b4d79abc2426def731':
Switch LocalSocketImpl.accept() over to using Os.accept()
Neil Fuller [Thu, 9 Jul 2015 11:43:47 +0000 (11:43 +0000)]
am
30d75e60: am
c83d1819: Merge "Switch from InetUnixAddress to UnixSocketAddress"
* commit '
30d75e60b3769a5bf7a948ebf5848813fcb8a838':
Switch from InetUnixAddress to UnixSocketAddress
Neil Fuller [Thu, 9 Jul 2015 11:23:00 +0000 (11:23 +0000)]
am
2ca4f73e: Merge "Switch LocalSocketImpl.accept() over to using Os.accept()"
* commit '
2ca4f73e8036b35085f12cdbcff3350812c42ff6':
Switch LocalSocketImpl.accept() over to using Os.accept()
Neil Fuller [Thu, 9 Jul 2015 11:11:08 +0000 (11:11 +0000)]
Merge "Switch LocalSocketImpl.accept() over to using Os.accept()"
Kenny Guy [Thu, 9 Jul 2015 10:18:05 +0000 (10:18 +0000)]
am
7d170797: Merge "Mute correct user from device policy manager." into mnc-dev
* commit '
7d170797ac844124b013b77cc220ccf115db12b7':
Mute correct user from device policy manager.
Narayan Kamath [Thu, 9 Jul 2015 10:17:57 +0000 (10:17 +0000)]
am
14b50394: Reduce overly aggressive use of narrowAm / narrowPm.
* commit '
14b503947727d7e58c9f2d50ceada378031fbe59':
Reduce overly aggressive use of narrowAm / narrowPm.
Kenny Guy [Thu, 9 Jul 2015 10:06:22 +0000 (10:06 +0000)]
Merge "Mute correct user from device policy manager." into mnc-dev
Neil Fuller [Thu, 9 Jul 2015 10:02:57 +0000 (10:02 +0000)]
am
c83d1819: Merge "Switch from InetUnixAddress to UnixSocketAddress"
* commit '
c83d18190d02ba848a800ded36d714270eefd226':
Switch from InetUnixAddress to UnixSocketAddress
Narayan Kamath [Wed, 8 Jul 2015 17:45:39 +0000 (18:45 +0100)]
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
Neil Fuller [Wed, 8 Jul 2015 10:33:54 +0000 (11:33 +0100)]
Switch LocalSocketImpl.accept() over to using Os.accept()
Bug:
3106438
Change-Id: I3b4a07cc2283c3cfdbaf3d2460f37264f67690e3
Neil Fuller [Thu, 9 Jul 2015 09:44:27 +0000 (09:44 +0000)]
Merge "Switch from InetUnixAddress to UnixSocketAddress"
David Friedman [Thu, 9 Jul 2015 07:07:51 +0000 (07:07 +0000)]
am
8cb9fd84: am
6051cd3e: am
1809f534: Docs: Changes to the "Support" preview page.
* commit '
8cb9fd846fe2337d56bd9c42fe8fc1586d107875':
Docs: Changes to the "Support" preview page.
David Friedman [Thu, 9 Jul 2015 06:56:51 +0000 (06:56 +0000)]
am
6051cd3e: am
1809f534: Docs: Changes to the "Support" preview page.
* commit '
6051cd3e1b38b9c5b18392ce8c440aaf16412f66':
Docs: Changes to the "Support" preview page.
David Friedman [Thu, 9 Jul 2015 06:42:49 +0000 (06:42 +0000)]
am
1809f534: Docs: Changes to the "Support" preview page.
* commit '
1809f534766b2f1d015806f8f37bcefe8337d7b8':
Docs: Changes to the "Support" preview page.
David Friedman [Thu, 9 Jul 2015 05:11:23 +0000 (22:11 -0700)]
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
Dirk Dougherty [Thu, 9 Jul 2015 04:40:01 +0000 (04:40 +0000)]
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.
Dirk Dougherty [Thu, 9 Jul 2015 04:22:28 +0000 (04:22 +0000)]
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.
David Friedman [Thu, 9 Jul 2015 04:09:43 +0000 (04:09 +0000)]
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.
Dirk Dougherty [Thu, 9 Jul 2015 04:09:36 +0000 (04:09 +0000)]
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.
David Friedman [Thu, 9 Jul 2015 03:56:07 +0000 (03:56 +0000)]
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.
Dirk Dougherty [Thu, 9 Jul 2015 03:56:01 +0000 (03:56 +0000)]
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.
Dirk Dougherty [Thu, 9 Jul 2015 03:54:37 +0000 (03:54 +0000)]
am
9d5df5ca: Merge "Doc change: add x86 to emulator spec." into mnc-preview-docs
* commit '
9d5df5ca0491dcb2309c81ec497137f5d7c7a602':
Doc change: add x86 to emulator spec.
Robert Greenwalt [Wed, 24 Jun 2015 20:23:42 +0000 (13:23 -0700)]
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
David Friedman [Thu, 9 Jul 2015 03:39:05 +0000 (03:39 +0000)]
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.
Dirk Dougherty [Thu, 9 Jul 2015 03:39:01 +0000 (03:39 +0000)]
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.
Jim Miller [Thu, 9 Jul 2015 03:34:37 +0000 (03:34 +0000)]
am
748bc36f: Remove "final" qualifier from AuthenticationResult
* commit '
748bc36f2eebfdc67520c5025b48fefdfd8d7c01':
Remove "final" qualifier from AuthenticationResult
Robert Greenwalt [Thu, 9 Jul 2015 03:34:29 +0000 (03:34 +0000)]
am
348988c5: Merge "Fix permissions on TelephonyManager" into mnc-dev
* commit '
348988c5704a5a6eb6aec093e295c2d9f00ee33c':
Fix permissions on TelephonyManager
Dirk Dougherty [Thu, 9 Jul 2015 03:25:39 +0000 (03:25 +0000)]
Merge "Doc change: add x86 to emulator spec." into mnc-preview-docs
Dirk Dougherty [Thu, 9 Jul 2015 03:23:04 +0000 (20:23 -0700)]
Doc change: add x86 to emulator spec.
Change-Id: I86209cf29f6fd2e0e73106cd0ba2aa81e54bcde1
David Friedman [Thu, 9 Jul 2015 03:21:46 +0000 (03:21 +0000)]
Merge "Docs: Fixes to the quick-view wrapper on non-English "about lollipop" pages." into mnc-preview-docs
Jim Miller [Thu, 9 Jul 2015 02:02:28 +0000 (19:02 -0700)]
Remove "final" qualifier from AuthenticationResult
This allows mock implementations to be created for testing
purposes.
Fixes bug
22362080
Change-Id: I5ff002c077d22b1338f2f4e394ad19827bb2ae9c
Robert Greenwalt [Thu, 9 Jul 2015 03:19:20 +0000 (03:19 +0000)]
Merge "Fix permissions on TelephonyManager" into mnc-dev
Dirk Dougherty [Thu, 9 Jul 2015 03:14:46 +0000 (03:14 +0000)]
Merge "Doc change: minor updates to KIs and AFW behavior changes." into mnc-preview-docs
Dirk Dougherty [Thu, 9 Jul 2015 03:10:49 +0000 (20:10 -0700)]
Doc change: minor updates to KIs and AFW behavior changes.
Change-Id: If1af0f85593db48b241d81dcb6df9d4a5c703105
Sanket Padawe [Thu, 9 Jul 2015 01:31:28 +0000 (01:31 +0000)]
am
58295e71: Merge "Add Null checks while processing pairing cancel intent" into mnc-dev
* commit '
58295e71d293c131508d280f1373d94716348b2e':
Add Null checks while processing pairing cancel intent
Adam Lesinski [Thu, 9 Jul 2015 01:31:21 +0000 (01:31 +0000)]
am
7fb1655a: Merge "BatteryStats: Fail gracefully on corrupt battery stats" into mnc-dev
* commit '
7fb1655a891de275ab8a752294c42b9c13352af6':
BatteryStats: Fail gracefully on corrupt battery stats
Sanket Padawe [Thu, 9 Jul 2015 01:16:01 +0000 (01:16 +0000)]
Merge "Add Null checks while processing pairing cancel intent" into mnc-dev
Adam Lesinski [Thu, 9 Jul 2015 01:15:14 +0000 (01:15 +0000)]
Merge "BatteryStats: Fail gracefully on corrupt battery stats" into mnc-dev
Sanket Padawe [Tue, 7 Jul 2015 21:12:15 +0000 (14:12 -0700)]
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
Robert Greenwalt [Thu, 9 Jul 2015 00:48:09 +0000 (00:48 +0000)]
am
de335a7d: Merge "Fix Permission Typo." into mnc-dev
* commit '
de335a7dc4dcd6b1de8f4c455184f4c82d42612d':
Fix Permission Typo.
Mady Mellor [Thu, 9 Jul 2015 00:43:35 +0000 (00:43 +0000)]
am
84005b40: Merge "Use hint text to position handle / floating tool bar popups" into mnc-dev
* commit '
84005b40499c0e9cc914afd69570c1f78c92b8d1':
Use hint text to position handle / floating tool bar popups
Svetoslav [Thu, 9 Jul 2015 00:43:29 +0000 (00:43 +0000)]
am
6638c182: Merge "Fix reset permissions on clear data and package uninstall." into mnc-dev
* commit '
6638c182635c6af036980ebdacc9c88411dcf583':
Fix reset permissions on clear data and package uninstall.
Svet Ganov [Thu, 9 Jul 2015 00:37:33 +0000 (00:37 +0000)]
am
9b84b5c5: Merge "Update storage group icon" into mnc-dev
* commit '
9b84b5c5131634ad81b161cb1806d4f5197e1712':
Update storage group icon
Jack Yu [Thu, 9 Jul 2015 00:37:27 +0000 (00:37 +0000)]
am
6b7a0784: Merge "Grant SMS permissions to Cell Broadcast receiver which emergency/non-emergency broadcast messages from the network." into mnc-dev
* commit '
6b7a07848b21001a41aea1b6426ec2f75ea652ec':
Grant SMS permissions to Cell Broadcast receiver which emergency/non-emergency broadcast messages from the network.
Amith Yamasani [Thu, 9 Jul 2015 00:37:22 +0000 (00:37 +0000)]
am
705ba960: Merge "Qualify the uid with the userId when granting permissions" into mnc-dev
* commit '
705ba9606325df6575d171ee96811d215e69b4e8':
Qualify the uid with the userId when granting permissions
Robert Greenwalt [Thu, 9 Jul 2015 00:36:31 +0000 (00:36 +0000)]
Merge "Fix Permission Typo." into mnc-dev
Adam Lesinski [Thu, 9 Jul 2015 00:09:34 +0000 (17:09 -0700)]
BatteryStats: Fail gracefully on corrupt battery stats
Bug:
22328963
Change-Id: Id0b4c6334706e58483d5fdfd2c1137bfb821c409
Christopher Tate [Wed, 8 Jul 2015 01:10:38 +0000 (18:10 -0700)]
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
Mady Mellor [Thu, 9 Jul 2015 00:06:11 +0000 (00:06 +0000)]
Merge "Use hint text to position handle / floating tool bar popups" into mnc-dev
Svetoslav [Wed, 8 Jul 2015 23:58:00 +0000 (23:58 +0000)]
Merge "Fix reset permissions on clear data and package uninstall." into mnc-dev
Robert Greenwalt [Wed, 8 Jul 2015 23:34:33 +0000 (16:34 -0700)]
Fix Permission Typo.
There is no 'd' in privilege. And there is no spell checking in Manifests.
bug:
22358954
Change-Id: Ia122f51a81dc35760f277e23fe0f5a6d3d739457
Svetoslav [Wed, 8 Jul 2015 01:18:15 +0000 (18:18 -0700)]
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
Svet Ganov [Wed, 8 Jul 2015 23:51:19 +0000 (23:51 +0000)]
Merge "Update storage group icon" into mnc-dev
Jack Yu [Wed, 8 Jul 2015 23:45:50 +0000 (23:45 +0000)]
Merge "Grant SMS permissions to Cell Broadcast receiver which emergency/non-emergency broadcast messages from the network." into mnc-dev
Wale Ogunwale [Wed, 8 Jul 2015 23:45:48 +0000 (23:45 +0000)]
am
dad62b9f: Merge "Finish already paused activity if it should be finished after pausing" into mnc-dev
* commit '
dad62b9f993b95bb9a0c20d29c69d35bd7531008':
Finish already paused activity if it should be finished after pausing
Amith Yamasani [Wed, 8 Jul 2015 23:44:53 +0000 (23:44 +0000)]
Merge "Qualify the uid with the userId when granting permissions" into mnc-dev
Wale Ogunwale [Wed, 8 Jul 2015 23:34:29 +0000 (23:34 +0000)]
Merge "Finish already paused activity if it should be finished after pausing" into mnc-dev
Jeff Sharkey [Wed, 8 Jul 2015 23:22:57 +0000 (23:22 +0000)]
am
9f4c4ee6: Merge "Fix crash looping SystemUI." into mnc-dev
* commit '
9f4c4ee66632e1355afa1218021ed728a99f7415':
Fix crash looping SystemUI.
Selim Cinek [Wed, 8 Jul 2015 23:22:51 +0000 (23:22 +0000)]
am
9201385f: Merge "Cleaned up the clipping logic for the dismiss motion." into mnc-dev
* commit '
9201385f2e59d58bc52a5fbe5a3b666850dcae5f':
Cleaned up the clipping logic for the dismiss motion.
Jeff Sharkey [Wed, 8 Jul 2015 23:14:09 +0000 (23:14 +0000)]
Merge "Fix crash looping SystemUI." into mnc-dev