OSDN Git Service

android-x86/frameworks-base.git
7 years agoMerge "Add free short codes for direct carrier billing and others" am: 73c50f7dbc
Robert Greenwalt [Thu, 13 Oct 2016 14:27:50 +0000 (14:27 +0000)]
Merge "Add free short codes for direct carrier billing and others" am: 73c50f7dbc
am: 6f8c54a16d

Change-Id: I3b7e0f86c18970ade30dc37d4d1f1365fc29be41

7 years agoMerge "Don't compare FQDN with providerFriendlyName" am: aae64557e1
Shinji Sogo [Thu, 13 Oct 2016 14:27:05 +0000 (14:27 +0000)]
Merge "Don't compare FQDN with providerFriendlyName" am: aae64557e1
am: 9c84160545

Change-Id: I9091af58eb06d5bf89847ac35aba9849e5e758cf

7 years agoMerge "RRO: Synchronize access to overlays.list" am: 78382db820
Adam Lesinski [Thu, 13 Oct 2016 14:26:07 +0000 (14:26 +0000)]
Merge "RRO: Synchronize access to overlays.list" am: 78382db820
am: 1b9303e8f0

Change-Id: I3d6b143ffc5c08249e9a0be35c39b0e89b364c20

7 years agoMerge "Fix split-screen flash issue" am: 6738617652
Jorim Jaggi [Thu, 13 Oct 2016 14:25:15 +0000 (14:25 +0000)]
Merge "Fix split-screen flash issue" am: 6738617652
am: f1fed4de21

Change-Id: I67953f2bda3222ec53f0f6d2423df8287439ffe1

7 years agoMerge "Tethering: check if configManager is null" am: e011bf80c5
Rebecca Silberstein [Thu, 13 Oct 2016 14:24:19 +0000 (14:24 +0000)]
Merge "Tethering: check if configManager is null" am: e011bf80c5
am: d1e4dbf002

Change-Id: I635dbc1b89c7e7458344f29979d5e62b37e2dd67

7 years agoMerge "Transplant the Logging system from Telecom" am: cbb03d1ad3
Brad Ebinger [Thu, 13 Oct 2016 14:23:04 +0000 (14:23 +0000)]
Merge "Transplant the Logging system from Telecom" am: cbb03d1ad3
am: 951dca8209

Change-Id: I954aeebe9375412cdbbbd49117b44131b33b8670

7 years agoMerge "IndexOutOfBoundsException observed in ProcessStats" am: 6408e2e5cc
Christopher Wiley [Thu, 13 Oct 2016 14:22:08 +0000 (14:22 +0000)]
Merge "IndexOutOfBoundsException observed in ProcessStats" am: 6408e2e5cc
am: eedd2b529d

Change-Id: Ica176cd4b1bf569dfa03bdcefac622deddb57eca

7 years agoMerge "Fix SurfaceViewPositionListener race bugs" am: 2dc11c0500
John Reck [Thu, 13 Oct 2016 14:21:20 +0000 (14:21 +0000)]
Merge "Fix SurfaceViewPositionListener race bugs" am: 2dc11c0500
am: ee3adf6d91

Change-Id: Ie8740252ca7dd3dab200303e88d1bd82370bbf4e

7 years agoMerge "List HF_INDICATORS_VALUE_CHANGED broadcast as protected" am: 5c043f51b0
Andre Eisenbach [Thu, 13 Oct 2016 14:20:28 +0000 (14:20 +0000)]
Merge "List HF_INDICATORS_VALUE_CHANGED broadcast as protected" am: 5c043f51b0
am: 3c3329bd34

Change-Id: I0e544c6d93caa8ef10289608ac9180ac6eeb59dd

7 years agoMerge "Debug: Use UniqueFile" am: 546f755bf8
Andreas Gampe [Thu, 13 Oct 2016 14:19:35 +0000 (14:19 +0000)]
Merge "Debug: Use UniqueFile" am: 546f755bf8
am: 8d151b26c2

Change-Id: Idd34de736fb73a07bc8b2f9c37ecf3b2080f1512

7 years agoMerge "DO NOT MERGE - Added Emergency affordance feature" am: a0322d5c5a -s ours
Selim Cinek [Thu, 13 Oct 2016 14:18:41 +0000 (14:18 +0000)]
Merge "DO NOT MERGE - Added Emergency affordance feature" am: a0322d5c5a  -s ours
am: 00c553e1ba  -s ours

Change-Id: I7e41e24257827c592a15ef446c95dd173a5b055c

7 years agoMerge "Modify the case in adjustFocus when the mFocusedActivity is null" am: 80587da3c1
lei.peng [Thu, 13 Oct 2016 14:17:59 +0000 (14:17 +0000)]
Merge "Modify the case in adjustFocus when the mFocusedActivity is null" am: 80587da3c1
am: 93c75d07c1

Change-Id: I5436618eb3ddd752a95caa5b0c427a3e32279a49

7 years agoMerge "Add cdma_3waycall_flash_delay key to CarrierConfig" into stage-aosp-master
Stephen Li [Thu, 13 Oct 2016 14:16:43 +0000 (14:16 +0000)]
Merge "Add cdma_3waycall_flash_delay key to CarrierConfig" into stage-aosp-master
am: 6accb573ab

Change-Id: I4e30dd844a5709d652c178be1b56e8f6e339464f

7 years agoAdd cdma_3waycall_flash_delay key to CarrierConfig
Jordan Liu [Thu, 13 Oct 2016 14:16:38 +0000 (14:16 +0000)]
Add cdma_3waycall_flash_delay key to CarrierConfig
am: e5535d71fc

Change-Id: I5f23c160109bbdc951ff03c6d9912acfb09c03fd

7 years agoMerge "Split the zygote logic out of android.os.Process into a new ZygoteProcess...
Stephen Li [Thu, 13 Oct 2016 14:15:42 +0000 (14:15 +0000)]
Merge "Split the zygote logic out of android.os.Process into a new ZygoteProcess class." into stage-aosp-master
am: 302b99512f

Change-Id: I79c5b83245cfda542f9bcd05e389738d6fee7b39

7 years agoMerge "resolve merge conflicts of 8f8d187 to nyc-dev-plus-aosp" into nyc-dev-plus...
Robert Sesek [Thu, 13 Oct 2016 14:13:36 +0000 (14:13 +0000)]
Merge "resolve merge conflicts of 8f8d187 to nyc-dev-plus-aosp" into nyc-dev-plus-aosp

7 years agoMerge "Add free short codes for direct carrier billing and others"
Robert Greenwalt [Wed, 12 Oct 2016 22:16:14 +0000 (22:16 +0000)]
Merge "Add free short codes for direct carrier billing and others"
am: 73c50f7dbc

Change-Id: I1c6fbd6107cf7a6819c6d7f42c5639fa029be54f

7 years agoMerge "Add free short codes for direct carrier billing and others"
Robert Greenwalt [Wed, 12 Oct 2016 22:05:32 +0000 (22:05 +0000)]
Merge "Add free short codes for direct carrier billing and others"

7 years agoMerge "Don't compare FQDN with providerFriendlyName"
Shinji Sogo [Wed, 12 Oct 2016 15:58:47 +0000 (15:58 +0000)]
Merge "Don't compare FQDN with providerFriendlyName"
am: aae64557e1

Change-Id: Ib6b070b49221ee39fe45048e54f71c34d637c05a

7 years agoMerge "Don't compare FQDN with providerFriendlyName"
Treehugger Robot [Wed, 12 Oct 2016 15:44:34 +0000 (15:44 +0000)]
Merge "Don't compare FQDN with providerFriendlyName"

7 years agoMerge "RRO: Synchronize access to overlays.list"
Adam Lesinski [Wed, 12 Oct 2016 15:03:20 +0000 (15:03 +0000)]
Merge "RRO: Synchronize access to overlays.list"
am: 78382db820

Change-Id: I000ec313e1ea90d56d89e2b784b9d2104bd0f7fa

7 years agoMerge "RRO: Synchronize access to overlays.list"
Adam Lesinski [Wed, 12 Oct 2016 14:52:48 +0000 (14:52 +0000)]
Merge "RRO: Synchronize access to overlays.list"

7 years agoMerge "Fix split-screen flash issue"
Jorim Jaggi [Wed, 12 Oct 2016 13:36:11 +0000 (13:36 +0000)]
Merge "Fix split-screen flash issue"
am: 6738617652

Change-Id: I5b4d32c30460f2b26fd31cc8dcf1b0b6463dbf28

7 years agoMerge "Fix split-screen flash issue"
Jorim Jaggi [Wed, 12 Oct 2016 13:24:46 +0000 (13:24 +0000)]
Merge "Fix split-screen flash issue"

7 years agoRRO: Synchronize access to overlays.list
Martin Wallgren [Tue, 11 Aug 2015 13:10:31 +0000 (15:10 +0200)]
RRO: Synchronize access to overlays.list

idmap --scan is executed as a part of the pre-loading in ZygoteInit.
The pre loading is executed in parallel for each supported architecture
(32/64 bit). This will cause a race condition in the creation of the
overlays.list file and the idmap files for the system overlays.

Apply flock on overlays.list to prevent the file from being thrown away
and recreated when it is in use by another Zygote.

Bug: 28032298

Change-Id: I51d39f121d207b11181340b68b164b60020f0c61

7 years agoMerge "Tethering: check if configManager is null"
Rebecca Silberstein [Wed, 12 Oct 2016 04:01:43 +0000 (04:01 +0000)]
Merge "Tethering: check if configManager is null"
am: e011bf80c5

Change-Id: I4aae5973e9b3efc4cf9e0ae6dd15f4b6871d87e3

7 years agoMerge "Tethering: check if configManager is null"
Treehugger Robot [Wed, 12 Oct 2016 03:48:02 +0000 (03:48 +0000)]
Merge "Tethering: check if configManager is null"

7 years agoMerge "docs: Removed "Accessibility" page from "Pure Android" design docs" into nyc-dev
Kevin Hufnagle [Wed, 12 Oct 2016 00:19:41 +0000 (00:19 +0000)]
Merge "docs: Removed "Accessibility" page from "Pure Android" design docs" into nyc-dev
am: 2acaf0a120

Change-Id: I6e0c4229e23693efed750bb8eaa39e3a81ed1bf7

7 years agodocs: Removed "Accessibility" page from "Pure Android" design docs
Kevin Hufnagle [Wed, 12 Oct 2016 00:19:36 +0000 (00:19 +0000)]
docs: Removed "Accessibility" page from "Pure Android" design docs
am: 1965375aa5

Change-Id: I0eade4d13850d53411fa86f0f14c6fdf096548d8

7 years agoTethering: check if configManager is null
Rebecca Silberstein [Tue, 4 Oct 2016 20:53:33 +0000 (13:53 -0700)]
Tethering: check if configManager is null

cherry-picked from b07f1409045091476e5296f9b0dd41c8712fe49a

Before attempting to retrieve a carrier entitlement setting, first make
sure we have a carrier config manager and if we do have a carrier config
manager, the config it holds is not null.

Bug: 31929638
Test: unittests coming in follow on CL
Change-Id: Iee476c476cb3de109cdccbd955b7fb986dd4267b

7 years agoMerge "docs: Removed "Accessibility" page from "Pure Android" design docs" into nyc-dev
Kevin Hufnagle [Tue, 11 Oct 2016 23:40:42 +0000 (23:40 +0000)]
Merge "docs: Removed "Accessibility" page from "Pure Android" design docs" into nyc-dev

7 years agoMerge "Transplant the Logging system from Telecom"
Brad Ebinger [Tue, 11 Oct 2016 22:30:31 +0000 (22:30 +0000)]
Merge "Transplant the Logging system from Telecom"
am: cbb03d1ad3

Change-Id: I216ed7c9ab32a8a21fc58ec1ee3972d5f881084a

7 years agoMerge "Transplant the Logging system from Telecom"
Brad Ebinger [Tue, 11 Oct 2016 22:24:15 +0000 (22:24 +0000)]
Merge "Transplant the Logging system from Telecom"

7 years agodocs: Changed Google Analytics link to https://
Andrew Solovay [Tue, 11 Oct 2016 20:32:14 +0000 (20:32 +0000)]
docs: Changed Google Analytics link to https://
am: 374ddfe529

Change-Id: I0c0042e565a920c806b38ef4f14012d77b2ffc41

7 years agodocs: Changed Google Analytics link to https://
Andrew Solovay [Tue, 11 Oct 2016 17:50:31 +0000 (10:50 -0700)]
docs: Changed Google Analytics link to https://

We've changed the script so the auto-generated versions of these
files will now use https:// for the Google Analytics links (required
if the files are going to be moved into Piper) but the existing
files haven't had that change applied, so I'm doing it by hand.

I'll build and stage to
https://android-dot-devsite.googleplex.com/sdk/support_api_diff/...

Change-Id: Ia11114920f84101522cd4511fde6a0363675bf24

7 years agoMerge "docs: Add Android developer written case studies" into nyc-dev
Joe Fernandez [Tue, 11 Oct 2016 15:58:37 +0000 (15:58 +0000)]
Merge "docs:  Add Android developer written case studies" into nyc-dev
am: d2c5657e9c

Change-Id: I08cdf407d11d9abaeeee92c9dd4079534f8cb3d5

7 years agodocs: Add Android developer written case studies
George French [Tue, 11 Oct 2016 15:58:31 +0000 (15:58 +0000)]
docs:  Add Android developer written case studies
am: cf71b1fdc0

Change-Id: I51bd536dfb4f0db5ea62f2c87ef7a05756ade6ed

7 years agoMerge "Docs: Developer written case studies batch 3 (proj 31)" into nyc-dev
Joe Fernandez [Tue, 11 Oct 2016 15:53:05 +0000 (15:53 +0000)]
Merge "Docs:  Developer written case studies batch 3 (proj 31)" into nyc-dev
am: cae752e66b

Change-Id: I987597df2df3f9a5111b06d45ef2ceebf35e7556

7 years agoDocs: Developer written case studies batch 3 (proj 31)
George French [Tue, 11 Oct 2016 15:53:00 +0000 (15:53 +0000)]
Docs:  Developer written case studies batch 3 (proj 31)
am: 26ab4135ab

Change-Id: Ib840c8fc23dd71735248871c901a0f6c79992854

7 years agoMerge "docs: Add Android developer written case studies" into nyc-dev
Joe Fernandez [Tue, 11 Oct 2016 15:47:26 +0000 (15:47 +0000)]
Merge "docs:  Add Android developer written case studies" into nyc-dev

7 years agoMerge "Docs: Developer written case studies batch 3 (proj 31)" into nyc-dev
Joe Fernandez [Tue, 11 Oct 2016 15:45:27 +0000 (15:45 +0000)]
Merge "Docs:  Developer written case studies batch 3 (proj 31)" into nyc-dev

7 years agodocs: Add Android developer written case studies
George French [Wed, 21 Sep 2016 00:09:29 +0000 (17:09 -0700)]
docs:  Add Android developer written case studies

- updated stories/index.jd, games.jd, apps.jd to use collections

bug: 30809628
Change-Id: Iffd7e5913979c6002234d07d495c8c10dca7f9f2

7 years agoAdd free short codes for direct carrier billing and others
Matthew Campbell [Fri, 7 Oct 2016 15:16:06 +0000 (16:16 +0100)]
Add free short codes for direct carrier billing and others

Whitelist free short code batch 2016 Q1 - Android Partner Engineering.
Short codes for Bahrain, Vietname and Slovakia are for Direct carrier
billing, USA and Brazil short codes are used by Google Allo and Italy
short code change is due to government regulation.

Test: manual - uploaded modified file onto test device and tested
sending sms to changed shortcodes to verify behaviour.

Bug: 30212667

Change-Id: If4fe0605d4ad5aafad9ce9b9670526d40ad88f45
Signed-off-by: Matthew Campbell <matthewca@google.com>
7 years agoMerge "docs: Revised Espresso code snippets" into nyc-dev
Kevin Hufnagle [Tue, 11 Oct 2016 07:36:57 +0000 (07:36 +0000)]
Merge "docs: Revised Espresso code snippets" into nyc-dev
am: aa78ed5b0a

Change-Id: I6609dc0031bd2e8f1c4d656f2c4a55c161e96071

7 years agodocs: Revised Espresso code snippets
Kevin Hufnagle [Tue, 11 Oct 2016 07:36:54 +0000 (07:36 +0000)]
docs: Revised Espresso code snippets
am: d3c3c34134

Change-Id: I125c4d0b0518fb3ab27fc273d3d90203b359e278

7 years agoMerge "docs: Revised Espresso code snippets" into nyc-dev
Kevin Hufnagle [Tue, 11 Oct 2016 07:24:45 +0000 (07:24 +0000)]
Merge "docs: Revised Espresso code snippets" into nyc-dev

7 years agoMerge "cherry-pick from mnc-io-docs: docs: Updated descriptions for CSV file settings...
Kevin Hufnagle [Tue, 11 Oct 2016 06:04:07 +0000 (06:04 +0000)]
Merge "cherry-pick from mnc-io-docs: docs: Updated descriptions for CSV file settings within IAB." into nyc-dev
am: 8e4ea67fa7

Change-Id: I2ca4ab1dfc68eb86a1f52ffb853b3d93320f648a

7 years agocherry-pick from mnc-io-docs: docs: Updated descriptions for CSV file settings within...
Kevin Hufnagle [Tue, 11 Oct 2016 06:04:01 +0000 (06:04 +0000)]
cherry-pick from mnc-io-docs: docs: Updated descriptions for CSV file settings within IAB.
am: 197226e4a5

Change-Id: I1b78f9a13cc794ce81fca9d4dbfeb77cb93b5391

7 years agoMerge "cherry-pick from mnc-io-docs: docs: Updated descriptions for CSV file settings...
Kevin Hufnagle [Tue, 11 Oct 2016 05:54:10 +0000 (05:54 +0000)]
Merge "cherry-pick from mnc-io-docs: docs: Updated descriptions for CSV file settings within IAB." into nyc-dev

7 years agodocs: Removed "Accessibility" page from "Pure Android" design docs
Kevin Hufnagle [Tue, 11 Oct 2016 03:47:16 +0000 (20:47 -0700)]
docs: Removed "Accessibility" page from "Pure Android" design docs

The "Accessibility" section of Google's material design guidelines
has superseded this design page on DAC. To avoid confusion among
readers, it's best to remove this page.

Bug: 29513203
Change-Id: I61e3bbc7cacc6bed05c33e4983b967408528e5cf

7 years agoMerge "IndexOutOfBoundsException observed in ProcessStats"
Christopher Wiley [Mon, 10 Oct 2016 22:41:23 +0000 (22:41 +0000)]
Merge "IndexOutOfBoundsException observed in ProcessStats"
am: 6408e2e5cc

Change-Id: I54ad3ac5a5e37371d787f4fee09fd8d73787665d

7 years agoresolve merge conflicts of 8f8d187 to nyc-dev-plus-aosp
Robert Sesek [Mon, 10 Oct 2016 22:34:42 +0000 (18:34 -0400)]
resolve merge conflicts of 8f8d187 to nyc-dev-plus-aosp

Change-Id: I75c7110ee4f0c9717e7276b609caa2402ef5c2be

7 years agoDocs: Developer written case studies batch 3 (proj 31)
George French [Thu, 6 Oct 2016 22:04:33 +0000 (15:04 -0700)]
Docs:  Developer written case studies batch 3 (proj 31)

bug: b/31739418
Change-Id: Iec92348aca9c4753a7a54b48c75d80dd5062dff0

7 years agoMerge "IndexOutOfBoundsException observed in ProcessStats"
Christopher Wiley [Mon, 10 Oct 2016 22:31:33 +0000 (22:31 +0000)]
Merge "IndexOutOfBoundsException observed in ProcessStats"

7 years agoDocs: Remove a reference to a deprecated sample
Bert McMeen [Mon, 10 Oct 2016 22:08:48 +0000 (22:08 +0000)]
Docs: Remove a reference to a deprecated sample
am: 3e01ab2b0e

Change-Id: I565f9a6a7613e8430b06537384126bdebbc8d07a

7 years agoMerge "Fix SurfaceViewPositionListener race bugs"
John Reck [Mon, 10 Oct 2016 22:00:31 +0000 (22:00 +0000)]
Merge "Fix SurfaceViewPositionListener race bugs"
am: 2dc11c0500

Change-Id: I504b1c0923c7c9b3fd393c37b3ba85af43882a8b

7 years agoMerge "Fix SurfaceViewPositionListener race bugs"
Treehugger Robot [Mon, 10 Oct 2016 21:48:52 +0000 (21:48 +0000)]
Merge "Fix SurfaceViewPositionListener race bugs"

7 years agoMerge "List HF_INDICATORS_VALUE_CHANGED broadcast as protected"
Andre Eisenbach [Mon, 10 Oct 2016 21:39:56 +0000 (21:39 +0000)]
Merge "List HF_INDICATORS_VALUE_CHANGED broadcast as protected"
am: 5c043f51b0

Change-Id: Ie58d2541c7f712641ab290a96b6cb86222692ddd

7 years agoMerge "List HF_INDICATORS_VALUE_CHANGED broadcast as protected"
Andre Eisenbach [Mon, 10 Oct 2016 21:25:06 +0000 (21:25 +0000)]
Merge "List HF_INDICATORS_VALUE_CHANGED broadcast as protected"

7 years agoList HF_INDICATORS_VALUE_CHANGED broadcast as protected
Jack He [Mon, 10 Oct 2016 19:37:40 +0000 (12:37 -0700)]
List HF_INDICATORS_VALUE_CHANGED broadcast as protected

android.bluetooth.headset.action.HF_INDICATORS_VALUE_CHANGED
notification should be protected.

Bug: 32059227
Test: manual
Change-Id: I06d4a7e3aa3a5586eb09d2538b4b526a5d073f9a

7 years agoMerge "Debug: Use UniqueFile"
Andreas Gampe [Mon, 10 Oct 2016 21:24:21 +0000 (21:24 +0000)]
Merge "Debug: Use UniqueFile"
am: 546f755bf8

Change-Id: I8696c83ddc9dbde46933810219f443dafa4b9d67

7 years agoMerge "DO NOT MERGE - Added Emergency affordance feature"
Selim Cinek [Mon, 10 Oct 2016 21:23:27 +0000 (21:23 +0000)]
Merge "DO NOT MERGE - Added Emergency affordance feature"
am: a0322d5c5a  -s ours

Change-Id: I9de0c5ce3ab2fb3e5c44cc518a32da1432846bbc

7 years agoMerge "Modify the case in adjustFocus when the mFocusedActivity is null"
lei.peng [Mon, 10 Oct 2016 21:22:45 +0000 (21:22 +0000)]
Merge "Modify the case in adjustFocus when the mFocusedActivity is null"
am: 80587da3c1

Change-Id: I394c312444e33f5b2fdcbe0887afb8ef58cef121

7 years agoDocs: Remove a reference to a deprecated sample
Bert McMeen [Mon, 10 Oct 2016 21:21:00 +0000 (14:21 -0700)]
Docs: Remove a reference to a deprecated sample

Bug: 31709180
Change-Id: Ieec19820b1154628236495541a28b50089c4e0cd

7 years agoMerge "Refactor ZygoteInit to support a WebView-specific zygote." into stage-aosp...
Tobias Sargeant [Mon, 10 Oct 2016 21:12:56 +0000 (21:12 +0000)]
Merge "Refactor ZygoteInit to support a WebView-specific zygote." into stage-aosp-master
am: 38bfbf8d2a

Change-Id: I617abd1cf479bcf8fb83e58b63e305636a73e6f9

7 years agoRefactor ZygoteInit to support a WebView-specific zygote.
Tobias Sargeant [Mon, 10 Oct 2016 21:12:49 +0000 (21:12 +0000)]
Refactor ZygoteInit to support a WebView-specific zygote.
am: dd4bb31639

Change-Id: Ie61bf8517c5b7a20beb67259d84e351f4a47665b

7 years agoMerge "Debug: Use UniqueFile"
Treehugger Robot [Mon, 10 Oct 2016 21:02:29 +0000 (21:02 +0000)]
Merge "Debug: Use UniqueFile"

7 years agoMerge "Add cdma_3waycall_flash_delay key to CarrierConfig" into stage-aosp-master
Stephen Li [Mon, 10 Oct 2016 20:44:02 +0000 (20:44 +0000)]
Merge "Add cdma_3waycall_flash_delay key to CarrierConfig" into stage-aosp-master

7 years agoMerge "Split the zygote logic out of android.os.Process into a new ZygoteProcess...
Stephen Li [Mon, 10 Oct 2016 20:43:41 +0000 (20:43 +0000)]
Merge "Split the zygote logic out of android.os.Process into a new ZygoteProcess class." into stage-aosp-master

7 years agoMerge "Refactor ZygoteInit to support a WebView-specific zygote." into stage-aosp...
TreeHugger Robot [Mon, 10 Oct 2016 20:42:36 +0000 (20:42 +0000)]
Merge "Refactor ZygoteInit to support a WebView-specific zygote." into stage-aosp-master

7 years agoMerge "DO NOT MERGE - Added Emergency affordance feature"
Treehugger Robot [Mon, 10 Oct 2016 20:41:13 +0000 (20:41 +0000)]
Merge "DO NOT MERGE - Added Emergency affordance feature"

7 years agoFix SurfaceViewPositionListener race bugs
John Reck [Mon, 27 Jun 2016 20:27:23 +0000 (13:27 -0700)]
Fix SurfaceViewPositionListener race bugs

Bug: 29628138

1: Make windowPositionLost synchronous as that's
what the Java side was expecting

2: Make the listener ref counted as otherwise
there's a race condition with the GC, which could
end up with use-after-frees

3: Ensure that all position updates are invoked
prior to frame completion

Change-Id: Iedbc017f611ba2878a49b4586612f79249ca2fe3
(cherry picked from commit 7b570deea65bc7ac417a26ce3e4103bcef30e957)

7 years agoMerge "Modify the case in adjustFocus when the mFocusedActivity is null"
Treehugger Robot [Mon, 10 Oct 2016 20:20:56 +0000 (20:20 +0000)]
Merge "Modify the case in adjustFocus when the mFocusedActivity is null"

7 years agoDebug: Use UniqueFile
Andreas Gampe [Wed, 5 Oct 2016 19:59:18 +0000 (12:59 -0700)]
Debug: Use UniqueFile

Test: m
Test: Device boots
Test: runtest --path frameworks/base/core/tests/coretests/src/com/android/internal/os/DebugTest.java
Change-Id: Ibd31046ceccfd94c1ec7ce2e0c4a748c009cc69f

7 years agoDO NOT MERGE - Added Emergency affordance feature
Selim Cinek [Tue, 13 Sep 2016 23:02:33 +0000 (16:02 -0700)]
DO NOT MERGE - Added Emergency affordance feature

Added a service that listens whether emergency affordances
are necessary.

If the they are needed, it adds an option to the
global actions dialog that directly launches the
emergency call and also adds a long-press listener
to the keyguard emergency button.

Test: adb shell settings put global force_emergency_affordance 1 && adb shell settings put global emergency_affordance_number 111112
Bug: 30404490
Change-Id: Ib96a15da2ef4b568a8d77140ebca6aa6f20f5ddb

7 years agoFix split-screen flash issue
Qiushi.Han [Mon, 10 Oct 2016 05:31:48 +0000 (13:31 +0800)]
Fix split-screen flash issue

For smaller size screens (such as 720p), in split-screen view,
the size of DividerSnapAlgorithm.mTargets is 3, the divider line
can only stop in the middle.

As the original logic, when tapping recent, it will cause the top-docked
activity to resize, leading to flash in some cases.

To fix this, do not call startDragging in this scenario.

Google issue:
https://code.google.com/p/android/issues/detail?id=224851

Change-Id: Iac58d536ccf668eed67f82418ce2cf90d46670ed

7 years agoIndexOutOfBoundsException observed in ProcessStats
pengzhicai [Tue, 27 Sep 2016 08:57:56 +0000 (16:57 +0800)]
IndexOutOfBoundsException observed in ProcessStats

When the process dead, IndexOutOfBoundsException observed in ProcessStats
https://code.google.com/p/android/issues/detail?id=223791&thanks=223791&ts=1474967996

Change-Id: Idbe4adf060c6898e838b5eaeecf476ba6c3e586d
Signed-off-by: pengzhicai <pengzhicai@xiaomi.com>
7 years agoModify the case in adjustFocus when the mFocusedActivity is null
lei.peng [Sat, 8 Oct 2016 09:58:37 +0000 (17:58 +0800)]
Modify the case in adjustFocus when the mFocusedActivity is null

Starting activity failed and the mFocusedActvity become null,
consider this condition when adjust focus.

Because in this condition, the focus mismatch between
ActivityManagerService#mFocusedActivity and
InputDispatcher(inputfilnger)#mFocusedApplication, ANR may occur.

Test: monkey test 48h with no ANR

Change-Id: Id1a2bf0d6ca6530e34443d359fbe2aa6c11b878c

7 years agoMerge "Rely on the platform -std default." am: 66f15cc01b
Elliott Hughes [Sat, 8 Oct 2016 21:58:52 +0000 (21:58 +0000)]
Merge "Rely on the platform -std default." am: 66f15cc01b
am: 5a989a504a

Change-Id: I1e8593f68eaafb254c92f004c2694ca4145c910a

7 years agoMerge "Rely on the platform -std default."
Elliott Hughes [Sat, 8 Oct 2016 21:53:48 +0000 (21:53 +0000)]
Merge "Rely on the platform -std default."
am: 66f15cc01b

Change-Id: I8930911314a16c499c6c8ea1b005e3c3ea7d95fa

7 years agoMerge "Rely on the platform -std default."
Treehugger Robot [Sat, 8 Oct 2016 21:45:16 +0000 (21:45 +0000)]
Merge "Rely on the platform -std default."

7 years agodocs: Revised Espresso code snippets
Kevin Hufnagle [Fri, 9 Sep 2016 04:22:37 +0000 (21:22 -0700)]
docs: Revised Espresso code snippets

The code snippet showing how to migrate subclasses of
ActivityInstrumentationTestCase2 to Espresso didn't compile. These
changes allow it to run successfully. Also removed obsolete section
describing using Espresso with ActivityInstrumentationTestCase2.

Bug: 27453733
Change-Id: Ib7c7e85d3299337f14be1482f7eb574c9a30dc22

7 years agoRely on the platform -std default.
Elliott Hughes [Fri, 7 Oct 2016 22:57:17 +0000 (15:57 -0700)]
Rely on the platform -std default.

Bug: http://b/32019064
Test: builds
Change-Id: I7180f1eb539ff8cbe33832d010775f053a922946

7 years agodocs: add collections for Distribute Stories, Games and Apps
Joe Fernandez [Fri, 7 Oct 2016 22:40:02 +0000 (22:40 +0000)]
docs: add collections for Distribute Stories, Games and Apps
am: d366709268

Change-Id: If58c868bd646995bf2e3303b5f3aa147a46516ae

7 years agoAdd cdma_3waycall_flash_delay key to CarrierConfig
Jordan Liu [Wed, 7 Sep 2016 19:01:24 +0000 (12:01 -0700)]
Add cdma_3waycall_flash_delay key to CarrierConfig

Add KEY_CDMA_3WAYCALL_FLASH_DELAY_INT and default value to
CarrierConfigManager, and remove the references to the old config in
core/res/res/values/[config.xml/symbols.xml]

Bug: 29873049
(cherry picked from commit bd3f2a7eb01b88d8e26deea4e4ef3e5ce423955c)

Change-Id: If3f658281e62d1c2669f862c6c3812a7437c6dce

7 years agoSplit the zygote logic out of android.os.Process into a new ZygoteProcess class.
Robert Sesek [Fri, 18 Mar 2016 20:52:57 +0000 (16:52 -0400)]
Split the zygote logic out of android.os.Process into a new ZygoteProcess class.

There is no functional change. This is to support adding new types of zygotes
that all operate using the same protocol.

Bug: 21643067
(cherry picked from commit 94e824bc1b5f83024b7c9a228a8f2d0cd1347d11)
(cherry picked from commit 96b49848e7784bc4b40ffd01e2524461e1efcab7)

Change-Id: I2e12057e4c2e7567f909d699b487e70b1664cca8

7 years agoRefactor ZygoteInit to support a WebView-specific zygote.
Tobias Sargeant [Tue, 19 Jan 2016 16:34:54 +0000 (16:34 +0000)]
Refactor ZygoteInit to support a WebView-specific zygote.

This is a non-functional change that separates out functionality
that should be shared between the system zygote and the WebView
zygote from that which is system zygote specific.

* Move MethodAndArgsCaller to Zygote.
* Split out server socket functions into ZygoteServer.
* Add a new (stub, for now) WebViewZygoteInit class.

Bug: 22084679
Bug: 21643067
(cherry picked from commit ba816e0c9efd8cd2aeef618a819a2ad46b742f87)
(cherry picked from commit b9679dc1fad508a001e30a941148e1bdc3fe953f)

Change-Id: Iefdb0784dd08ac09a23aafe18663c13dce421775

7 years agodocs: add collections for Distribute Stories, Games and Apps
Joe Fernandez [Fri, 7 Oct 2016 21:11:49 +0000 (14:11 -0700)]
docs: add collections for Distribute Stories, Games and Apps

b/31741249

Change-Id: I873ce82f18c5edbdeb85fb2fdb25ba322760a2dc

7 years agoMerge "jni: move security interfaces to private" am: 07bc1ee77d
Mark Salyzyn [Fri, 7 Oct 2016 15:20:36 +0000 (15:20 +0000)]
Merge "jni: move security interfaces to private" am: 07bc1ee77d
am: 82df72dc1f

Change-Id: I63c71141a74cdfe55080492353f1bb2cc4e5e696

7 years agoMerge "jni: move security interfaces to private"
Mark Salyzyn [Fri, 7 Oct 2016 15:17:05 +0000 (15:17 +0000)]
Merge "jni: move security interfaces to private"
am: 07bc1ee77d

Change-Id: Ic46ceb9fce64a7db977013254622bc24b91f6f3e

7 years agoMerge "jni: move security interfaces to private"
Treehugger Robot [Fri, 7 Oct 2016 15:03:01 +0000 (15:03 +0000)]
Merge "jni: move security interfaces to private"

7 years agoMerge "Force APKs to be streamed" into nyc-dev
Todd Kennedy [Fri, 7 Oct 2016 14:29:07 +0000 (14:29 +0000)]
Merge "Force APKs to be streamed" into nyc-dev
am: dd100f4298

Change-Id: Ic29843ba26e6bab7cd285cde30f7572af920090a

7 years agoForce APKs to be streamed
Todd Kennedy [Fri, 7 Oct 2016 14:29:04 +0000 (14:29 +0000)]
Force APKs to be streamed
am: d220683d33

Change-Id: I17a44d4b985a08b565d8c287cfee573cacb0216c

7 years agoMerge "Force APKs to be streamed" into nyc-dev
TreeHugger Robot [Fri, 7 Oct 2016 14:21:26 +0000 (14:21 +0000)]
Merge "Force APKs to be streamed" into nyc-dev

7 years agoMerge "Make PIN/password failed attempts dialog non-cancelable" am: 708543b5ff
Edward Savage-Jones [Fri, 7 Oct 2016 11:21:55 +0000 (11:21 +0000)]
Merge "Make PIN/password failed attempts dialog non-cancelable" am: 708543b5ff
am: d94cc68123

Change-Id: I69df9317467dc48fdd0c39081fcd5a9e65d72cc1

7 years agoMerge "Make PIN/password failed attempts dialog non-cancelable"
Edward Savage-Jones [Fri, 7 Oct 2016 11:17:49 +0000 (11:17 +0000)]
Merge "Make PIN/password failed attempts dialog non-cancelable"
am: 708543b5ff

Change-Id: I2a95bd2a53f3ef73f63b6d955528cb16dbd4de10

7 years agoMerge "Make PIN/password failed attempts dialog non-cancelable"
Treehugger Robot [Fri, 7 Oct 2016 11:09:26 +0000 (11:09 +0000)]
Merge "Make PIN/password failed attempts dialog non-cancelable"

7 years agoMerge "Relax namespace restriction on system server classloader" am: a8135325c1
Dimitry Ivanov [Fri, 7 Oct 2016 08:53:06 +0000 (08:53 +0000)]
Merge "Relax namespace restriction on system server classloader" am: a8135325c1
am: 3c6b4961cb

Change-Id: I60ab1b74e82a11da485e30a7ea5e45e49c5498c9

7 years agoMerge "Relax namespace restriction on system server classloader"
Dimitry Ivanov [Fri, 7 Oct 2016 08:45:18 +0000 (08:45 +0000)]
Merge "Relax namespace restriction on system server classloader"
am: a8135325c1

Change-Id: Ie6b5e9041c1a03a8a6b2343069ef2a37b9aba9aa

7 years agoMerge "Relax namespace restriction on system server classloader"
Dimitry Ivanov [Fri, 7 Oct 2016 08:34:41 +0000 (08:34 +0000)]
Merge "Relax namespace restriction on system server classloader"