OSDN Git Service
Sungsoo [Thu, 13 Oct 2016 21:57:06 +0000 (21:57 +0000)]
ExifInterface: Provide backward compatibility
am:
2dbe166801
Change-Id: I03afc66b63398a4c1e31324ad7d543fa1d9d0694
Svetoslav Ganov [Thu, 13 Oct 2016 20:20:06 +0000 (20:20 +0000)]
Merge "Allow SetupWizard to do WiFi scans if location off" am:
c98b34bdce
am:
72510e6244
Change-Id: Ib4468dc91eae1f6c26cdde4b70e911aa38696e27
Svetoslav Ganov [Thu, 13 Oct 2016 20:15:38 +0000 (20:15 +0000)]
Merge "Allow SetupWizard to do WiFi scans if location off"
am:
c98b34bdce
Change-Id: Ibfd31e4ce200479201abb14c28d883b556a62b6b
Svetoslav Ganov [Thu, 13 Oct 2016 20:06:37 +0000 (20:06 +0000)]
Merge "Allow SetupWizard to do WiFi scans if location off"
Bert McMeen [Thu, 13 Oct 2016 17:39:07 +0000 (17:39 +0000)]
Docs: Updates to the Download/Test file related to watch setup
am:
137c545e4e
Change-Id: I91ed5e485e29bbed111acab07ef42d7cfc33dfe7
Yuta Yamada [Thu, 13 Oct 2016 14:30:09 +0000 (14:30 +0000)]
Merge "Fix memory leak of Dnd tile" am:
6057a8360a
am:
465397e28e
Change-Id: I66d6f38d6f53251c0bc58d9ea49b4458d8b000f9
Selim Cinek [Thu, 13 Oct 2016 14:29:21 +0000 (14:29 +0000)]
Merge "DO NOT MERGE - Fixed an issue where the emergency affordance would show" am:
6f3a05ae77 -s ours
am:
20307881d7 -s ours
Change-Id: I14e0635d7ed1d7caf14f9217d5d0bf88685a738f
Selim Cinek [Thu, 13 Oct 2016 14:28:39 +0000 (14:28 +0000)]
Merge "DO NOT MERGE - Added translations for emergency action string" am:
d33e79c328 -s ours
am:
cb654a5fbd -s ours
Change-Id: I54c256a00fa10c6eaffc6acb4108e81144ec2722
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
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
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
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
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
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
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
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
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
Andreas Gampe [Thu, 13 Oct 2016 14:19:35 +0000 (14:19 +0000)]
Merge "Debug: Use UniqueFile" am:
546f755bf8
am:
8d151b26c2
Change-Id: Idd34de736fb73a07bc8b2f9c37ecf3b2080f1512
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
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
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
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
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
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
Yuta Yamada [Thu, 13 Oct 2016 13:10:12 +0000 (13:10 +0000)]
Merge "Fix memory leak of Dnd tile"
am:
6057a8360a
Change-Id: Iabe8449a6703104d4dc14f67bad411fad7236e62
Treehugger Robot [Thu, 13 Oct 2016 13:00:45 +0000 (13:00 +0000)]
Merge "Fix memory leak of Dnd tile"
Sungsoo [Thu, 13 Oct 2016 03:57:44 +0000 (12:57 +0900)]
ExifInterface: Provide backward compatibility
ExifInterface.saveAttribute() didn't throw UnsupportedOperationException
before. Use IOException instead of UnsupportedOperationException for
backward compatibility.
Bug:
30936376, Bug:
32068647, Bug:
31319086
Change-Id: Ifb478db3af820eb846c5373d3a284367da3495a0
Selim Cinek [Thu, 13 Oct 2016 01:01:10 +0000 (01:01 +0000)]
Merge "DO NOT MERGE - Fixed an issue where the emergency affordance would show"
am:
6f3a05ae77 -s ours
Change-Id: I6c171749daead32d9a5e88aefa0a2a50cd767253
Selim Cinek [Thu, 13 Oct 2016 01:00:24 +0000 (01:00 +0000)]
Merge "DO NOT MERGE - Added translations for emergency action string"
am:
d33e79c328 -s ours
Change-Id: I3fe6f222f2c70a0b50147f5439c54d8553dda092
Selim Cinek [Thu, 13 Oct 2016 00:48:24 +0000 (00:48 +0000)]
Merge "DO NOT MERGE - Fixed an issue where the emergency affordance would show"
Treehugger Robot [Thu, 13 Oct 2016 00:45:20 +0000 (00:45 +0000)]
Merge "DO NOT MERGE - Added translations for emergency action string"
Selim Cinek [Tue, 11 Oct 2016 23:45:41 +0000 (16:45 -0700)]
DO NOT MERGE - Added translations for emergency action string
Bug:
30404490
Change-Id: Ic20d93005882bb71cef32a705443e427b0a9bd71
Selim Cinek [Tue, 11 Oct 2016 19:49:48 +0000 (12:49 -0700)]
DO NOT MERGE - Fixed an issue where the emergency affordance would show
If a device isn't voice capable, it shouldn't show the emergency
option.
Test: use tablet which isn't voice capable, insert indian sim and
make sure no emergency option is displayed in global actions.
Bug:
31953703
Change-Id: I351e87320f3ffec76d1c1fc5aac78e5c48c0ac54
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
Robert Greenwalt [Wed, 12 Oct 2016 22:05:32 +0000 (22:05 +0000)]
Merge "Add free short codes for direct carrier billing and others"
Bert McMeen [Tue, 11 Oct 2016 22:50:54 +0000 (15:50 -0700)]
Docs: Updates to the Download/Test file related to watch setup
Bug:
32091353
Change-Id: I8b70b33c537c2edbaf0fbd09e62dc9564f03cd07
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
Treehugger Robot [Wed, 12 Oct 2016 15:44:34 +0000 (15:44 +0000)]
Merge "Don't compare FQDN with providerFriendlyName"
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
Adam Lesinski [Wed, 12 Oct 2016 14:52:48 +0000 (14:52 +0000)]
Merge "RRO: Synchronize access to overlays.list"
Jorim Jaggi [Wed, 12 Oct 2016 13:36:11 +0000 (13:36 +0000)]
Merge "Fix split-screen flash issue"
am:
6738617652
Change-Id: I5b4d32c30460f2b26fd31cc8dcf1b0b6463dbf28
Jorim Jaggi [Wed, 12 Oct 2016 13:24:46 +0000 (13:24 +0000)]
Merge "Fix split-screen flash issue"
Yuta Yamada [Thu, 6 Oct 2016 08:40:19 +0000 (17:40 +0900)]
Fix memory leak of Dnd tile
The instance of Dnd tile leaks when user taps the edit button
of Quick Settings. To fix this issue, QSTile#destroy should be
called when the tile is no longer needed.
Bug:
32103239
Test: manual - go to Quick Settings -> Edit repeatedly
Change-Id: I9bc9ee836be5c8e46eb1ccd202bd5cc50070ef47
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
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
Treehugger Robot [Wed, 12 Oct 2016 03:48:02 +0000 (03:48 +0000)]
Merge "Tethering: check if configManager is null"
Svetoslav Ganov [Wed, 12 Oct 2016 01:16:46 +0000 (18:16 -0700)]
Allow SetupWizard to do WiFi scans if location off
Location permission is needed for apps to do WiFi scans
and if location is globally off no app can scan too. It
is possible that an OEM does not want location to be on
until the user agrees to that or a device owner can turn
location off before setup. As a result setup wizard
cannot show the WiFi networks preventing the user form
logging in. This change allows the setup wizard component
to perform WiFi scans even if location is globally off.
bug:
29577364
Change-Id: I6b7c5dca76b8c8ee6051ea2dad3cec6879683524
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
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
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
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
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
Brad Ebinger [Tue, 11 Oct 2016 22:24:15 +0000 (22:24 +0000)]
Merge "Transplant the Logging system from Telecom"
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
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
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
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
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
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
Joe Fernandez [Tue, 11 Oct 2016 15:47:26 +0000 (15:47 +0000)]
Merge "docs: Add Android developer written case studies" 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
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
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>
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
Kevin Hufnagle [Tue, 11 Oct 2016 07:36:54 +0000 (07:36 +0000)]
docs: Revised Espresso code snippets
am:
d3c3c34134
Change-Id: I125c4d0b0518fb3ab27fc273d3d90203b359e278
Kevin Hufnagle [Tue, 11 Oct 2016 07:24:45 +0000 (07:24 +0000)]
Merge "docs: Revised Espresso code snippets" into nyc-dev
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
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
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
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
Christopher Wiley [Mon, 10 Oct 2016 22:41:23 +0000 (22:41 +0000)]
Merge "IndexOutOfBoundsException observed in ProcessStats"
am:
6408e2e5cc
Change-Id: I54ad3ac5a5e37371d787f4fee09fd8d73787665d
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
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
Christopher Wiley [Mon, 10 Oct 2016 22:31:33 +0000 (22:31 +0000)]
Merge "IndexOutOfBoundsException observed in ProcessStats"
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
John Reck [Mon, 10 Oct 2016 22:00:31 +0000 (22:00 +0000)]
Merge "Fix SurfaceViewPositionListener race bugs"
am:
2dc11c0500
Change-Id: I504b1c0923c7c9b3fd393c37b3ba85af43882a8b
Treehugger Robot [Mon, 10 Oct 2016 21:48:52 +0000 (21:48 +0000)]
Merge "Fix SurfaceViewPositionListener race bugs"
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
Andre Eisenbach [Mon, 10 Oct 2016 21:25:06 +0000 (21:25 +0000)]
Merge "List 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
Andreas Gampe [Mon, 10 Oct 2016 21:24:21 +0000 (21:24 +0000)]
Merge "Debug: Use UniqueFile"
am:
546f755bf8
Change-Id: I8696c83ddc9dbde46933810219f443dafa4b9d67
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
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
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
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
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
Treehugger Robot [Mon, 10 Oct 2016 21:02:29 +0000 (21:02 +0000)]
Merge "Debug: Use UniqueFile"
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
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
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
Treehugger Robot [Mon, 10 Oct 2016 20:41:13 +0000 (20:41 +0000)]
Merge "DO NOT MERGE - Added Emergency affordance feature"
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)
Treehugger Robot [Mon, 10 Oct 2016 20:20:56 +0000 (20:20 +0000)]
Merge "Modify the case in adjustFocus when the mFocusedActivity is null"
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
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
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
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>
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
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
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
OSDN Git Service
