Commit Graph

277484 Commits

Author SHA1 Message Date
Treehugger Robot
546f755bf8 Merge "Debug: Use UniqueFile" 2016-10-10 21:02:29 +00:00
Stephen Li
6accb573ab Merge "Add cdma_3waycall_flash_delay key to CarrierConfig" into stage-aosp-master 2016-10-10 20:44:05 +00:00
Stephen Li
302b99512f Merge "Split the zygote logic out of android.os.Process into a new ZygoteProcess class." into stage-aosp-master 2016-10-10 20:43:44 +00:00
TreeHugger Robot
38bfbf8d2a Merge "Refactor ZygoteInit to support a WebView-specific zygote." into stage-aosp-master 2016-10-10 20:42:38 +00:00
Treehugger Robot
a0322d5c5a Merge "DO NOT MERGE - Added Emergency affordance feature" 2016-10-10 20:41:14 +00:00
John Reck
85ddb2df2f 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 7b570deea6)
2016-10-10 13:36:36 -07:00
Treehugger Robot
80587da3c1 Merge "Modify the case in adjustFocus when the mFocusedActivity is null" 2016-10-10 20:20:56 +00:00
Andreas Gampe
7ad2f6e7cc 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
2016-10-10 12:55:13 -07:00
sergeyv
5bb5626599 Turn off additional logging in text rendering
Change-Id: If5f11489c05e320e4436fb57680857b29228a755
b:30427106
2016-10-10 12:25:06 -07:00
Lifu Tang
48597a8f2b Merge "Fixed the memory leak when receiving Nav messages" into nyc-mr1-dev am: 9e4733ed33
am: 2e7ae067cd

Change-Id: Iec7b935356ce541e45dbd011f7ce6c14c40368cc
2016-10-10 19:22:14 +00:00
Lifu Tang
7c0bd74ddc Fixed the memory leak when receiving Nav messages am: fe427f24e5
am: 8786a6b904

Change-Id: Icf0f81dc2c9c9fa0801edb1e2f13a20460e470f0
2016-10-10 19:21:16 +00:00
Lifu Tang
2e7ae067cd Merge "Fixed the memory leak when receiving Nav messages" into nyc-mr1-dev
am: 9e4733ed33

Change-Id: I8f03a3d36e8836ffc14e9986114b1e3ccb40cc2d
2016-10-10 19:12:43 +00:00
Lifu Tang
8786a6b904 Fixed the memory leak when receiving Nav messages
am: fe427f24e5

Change-Id: Iaae06561c8247b2292a10ec24bf3d1a264850ad9
2016-10-10 19:12:38 +00:00
Lifu Tang
9e4733ed33 Merge "Fixed the memory leak when receiving Nav messages" into nyc-mr1-dev 2016-10-10 19:00:10 +00:00
Selim Cinek
e0c3c660a7 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
2016-10-10 18:58:23 +00:00
Bill Yi
23c4362dac Import translations. DO NOT MERGE
Change-Id: I00d5ccf364c1b124e586148a139779a94cfafbf4
Auto-generated-cl: translation import
2016-10-10 11:30:39 -07:00
Selim Cinek
5f2ca6b1a1 Fixed a bug where the header would flicker weirdly when replying
Also fixed a bug where the header could stay on the lockscreen.

Change-Id: Icad3d0db7b95745bd640b20750b9f0eba383d798
Fixes: 31469380
2016-10-10 10:57:03 -07:00
Jorim Jaggi
aec5f11e69 Merge "Fix dismissing window showing" into nyc-mr1-dev am: b29dadb939
am: 15ece4787e

Change-Id: Id568cea89401c8e78ba9b0b59c8fd7f026c031db
2016-10-10 12:46:26 +00:00
Jorim Jaggi
cc742ac150 Fix dismissing window showing am: f20b1428f8
am: 84e863e02f

Change-Id: Ice5d68b5aeebca1c6d20336185ab23f11335a78d
2016-10-10 12:44:15 +00:00
Jorim Jaggi
15ece4787e Merge "Fix dismissing window showing" into nyc-mr1-dev
am: b29dadb939

Change-Id: If668d9f895845362e171d74dd2c3884c35bf92af
2016-10-10 11:55:18 +00:00
Jorim Jaggi
84e863e02f Fix dismissing window showing
am: f20b1428f8

Change-Id: I58829c0bc567fc3c48e03276075d9256649d84e3
2016-10-10 11:55:13 +00:00
Jorim Jaggi
b29dadb939 Merge "Fix dismissing window showing" into nyc-mr1-dev 2016-10-10 11:47:02 +00:00
Qiushi.Han
9170ca82bd 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
2016-10-10 14:07:39 +08:00
Lifu Tang
fe427f24e5 Fixed the memory leak when receiving Nav messages
Bug: 32038182

Change-Id: Ie659dc945d6efc7feaf9285d3e7375c90cba7234
2016-10-09 09:37:12 -07:00
pengzhicai
5c6740a30c 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>
2016-10-09 12:37:30 +00:00
lei.peng
75685f7437 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
2016-10-09 10:35:20 +08:00
Doris Liu
5ef10f1d26 Support calling start() in onAnimationFinished(...) in AVD am: 679fe6ab6f
am: 4a1ea9ba7e

Change-Id: If343048fcbe8e2af46b6cdfcd5953c0d5ffa6c4e
2016-10-08 23:56:52 +00:00
Doris Liu
4a1ea9ba7e Support calling start() in onAnimationFinished(...) in AVD
am: 679fe6ab6f

Change-Id: I2999f6fc543f56d73cd03fe74b466c033d6c7d1a
2016-10-08 23:52:20 +00:00
Elliott Hughes
437b8c95a8 Merge "Rely on the platform -std default." am: 66f15cc01b am: 5a989a504a
am: 39ad1b92fa

Change-Id: Iec4bca8e96c776d61c5da5540a74acc6773c2bce
2016-10-08 22:03:56 +00:00
Elliott Hughes
39ad1b92fa Merge "Rely on the platform -std default." am: 66f15cc01b
am: 5a989a504a

Change-Id: I1e8593f68eaafb254c92f004c2694ca4145c910a
2016-10-08 21:58:52 +00:00
Elliott Hughes
5a989a504a Merge "Rely on the platform -std default."
am: 66f15cc01b

Change-Id: I8930911314a16c499c6c8ea1b005e3c3ea7d95fa
2016-10-08 21:53:48 +00:00
Treehugger Robot
66f15cc01b Merge "Rely on the platform -std default." 2016-10-08 21:45:16 +00:00
Doris Liu
679fe6ab6f Support calling start() in onAnimationFinished(...) in AVD
This CL fixed an issue where calling start() from onAnimationFinished()
caused AnimationListenerBridge::onAnimationFinished(...) to be unsafely
re-entered and the new start listener was (incorrectly) reset to null.

BUG: 31971397
Test: test apk in the bug linked above
Change-Id: Ica809ef2dab884950b93b54f2d0cb4b81e9830f1
2016-10-08 21:00:14 +00:00
Kevin Hufnagle
d3c3c34134 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
2016-10-07 17:21:35 -07:00
Michael Kwan
ac29ce3fe2 Fix issue where icon was not centered properly.
Bug: 29250733
Change-Id: I5816e77fa3cb27ba92027e40e1c5cc51279ca8d2
2016-10-07 15:59:06 -07:00
Elliott Hughes
c08e32e0be Rely on the platform -std default.
Bug: http://b/32019064
Test: builds
Change-Id: I7180f1eb539ff8cbe33832d010775f053a922946
2016-10-07 15:57:17 -07:00
Joe Fernandez
3590533125 docs: add collections for Distribute Stories, Games and Apps am: d366709268 am: a424ec21cb am: ad81502f20
am: 180ebf16c9

Change-Id: Icdd71b8e8873c91b4c4bc605e6389f486321cb96
2016-10-07 22:56:05 +00:00
Joe Fernandez
180ebf16c9 docs: add collections for Distribute Stories, Games and Apps am: d366709268 am: a424ec21cb
am: ad81502f20

Change-Id: I3a356a7414dbf70d58fced4b300f10eff5ce5298
2016-10-07 22:52:04 +00:00
Joe Fernandez
82dace9cab docs: add collections for Distribute Stories, Games and Apps am: d366709268
am: 2d8c89cd66

Change-Id: Ief2f0d18fcda518e5a74a740c07c0243e9d8b63b
2016-10-07 22:48:05 +00:00
Joe Fernandez
ad81502f20 docs: add collections for Distribute Stories, Games and Apps am: d366709268
am: a424ec21cb

Change-Id: Iaebda3b697804c384c9df039ab104d49f0b5ddec
2016-10-07 22:48:01 +00:00
Joe Fernandez
a424ec21cb docs: add collections for Distribute Stories, Games and Apps
am: d366709268

Change-Id: I13ac71c0e908a0a7ffd76babe7fcb4e39ff1352e
2016-10-07 22:40:02 +00:00
Joe Fernandez
2d8c89cd66 docs: add collections for Distribute Stories, Games and Apps
am: d366709268

Change-Id: If58c868bd646995bf2e3303b5f3aa147a46516ae
2016-10-07 22:40:02 +00:00
Jordan Liu
e5535d71fc 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 bd3f2a7eb0)

Change-Id: If3f658281e62d1c2669f862c6c3812a7437c6dce
2016-10-07 14:25:56 -07:00
Robert Sesek
8f8d187a78 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 94e824bc1b)
(cherry picked from commit 96b49848e7)

Change-Id: I2e12057e4c2e7567f909d699b487e70b1664cca8
2016-10-07 14:25:36 -07:00
Tobias Sargeant
dd4bb31639 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 ba816e0c9e)
(cherry picked from commit b9679dc1fa)

Change-Id: Iefdb0784dd08ac09a23aafe18663c13dce421775
2016-10-07 14:25:20 -07:00
Wyatt Riley
e0572e6e7c Merge "Removing over-active NTP & XTRA assistance downloads" into nyc-mr1-dev am: d270004959
am: a0e54db0cd

Change-Id: Ic4859e6f70a082acfa627e7b2e409a4765e41376
2016-10-07 21:23:15 +00:00
Wyatt Riley
4ddb8d5915 Removing over-active NTP & XTRA assistance downloads am: 0d6e54e246
am: b517705602

Change-Id: I54a33e6d30b0b502e2e886ad4dd54086a7f0c17e
2016-10-07 21:22:23 +00:00
Wyatt Riley
a0e54db0cd Merge "Removing over-active NTP & XTRA assistance downloads" into nyc-mr1-dev
am: d270004959

Change-Id: I2a63754f83346825bce28f5849fcf53794e64929
2016-10-07 21:13:57 +00:00
Wyatt Riley
b517705602 Removing over-active NTP & XTRA assistance downloads
am: 0d6e54e246

Change-Id: I6d6a151fb7bb13ddabed10aa33f20aec8cefe8a8
2016-10-07 21:13:54 +00:00
Joe Fernandez
d366709268 docs: add collections for Distribute Stories, Games and Apps
b/31741249

Change-Id: I873ce82f18c5edbdeb85fb2fdb25ba322760a2dc
2016-10-07 14:11:49 -07:00