252513 Commits

Author SHA1 Message Date
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 7b570deea65bc7ac417a26ce3e4103bcef30e957)
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
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
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
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
Treehugger Robot
66f15cc01b Merge "Rely on the platform -std default." 2016-10-08 21:45:16 +00: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
Robert Sesek
ded2098436 Create the WebViewZygote and implement WebViewZygoteInit.
This adds a new init-spawned daemon, webview_zygote, that starts a JVM and
acts as a zygote process for WebView isolated_app services.

Test: m
Test: angler boots
Test: Turn on Settings>Developer>Multiprocess Webview. webview_zygote32 or
      webview_zygote64 start (requires dependent CLs).

Bug: 21643067
Change-Id: Ida98bd04b4d77736b672b03af651c4eb97ce88c1
2016-10-07 12:38:04 -04:00
Treehugger Robot
07bc1ee77d Merge "jni: move security interfaces to private" 2016-10-07 15:03:01 +00:00
Treehugger Robot
708543b5ff Merge "Make PIN/password failed attempts dialog non-cancelable" 2016-10-07 11:09:27 +00:00
Dimitry Ivanov
a8135325c1 Merge "Relax namespace restriction on system server classloader" 2016-10-07 08:34:41 +00:00
Treehugger Robot
7c4efe421c Merge "Debug: Add test for bug 31943543" 2016-10-07 00:37:50 +00:00
Treehugger Robot
8d08d0fa83 Merge "Correctly pass number of input allocations for BLAS" 2016-10-06 21:04:56 +00:00
Jakub Pawlowski
44c013d739 Merge "Fix connecting to profiles when bonding from local device (1/3)" 2016-10-06 20:54:08 +00:00
Andreas Gampe
636451443f Debug: Add test for bug 31943543
Bug: 31943543
Test: adb shell setprop debug.checkjni 1 && runtest --path frameworks/base/core/tests/coretests/src/com/android/internal/os/DebugTest.java
Change-Id: I895f3f9927ed3572dc4e77b49d12cadd53ce5d6a
2016-10-06 13:49:52 -07:00
Miao Wang
b742fcc808 Correctly pass number of input allocations for BLAS
Bug: 31992305

Test: Build and CTS RsBlas test pass on Angler.
Change-Id: If49c0be003d9c2a2175924dc3303703b9ab49357
2016-10-06 10:45:42 -07:00
Treehugger Robot
05d950ee3b Merge "wifi: WifiEnterpriseConfig: use ParcelUtil to parcelize key and certificates" 2016-10-06 17:35:33 +00:00
Treehugger Robot
0169a3b094 Merge "wifi: add ParcelUtil for parcelizing non-parcelable objects" 2016-10-06 17:21:44 +00:00
Neil Fuller
8873c3821d Merge "Remove .mk lines that are just setting the default" 2016-10-06 08:31:34 +00:00
Etan Cohen
f12c6e4f5e Merge "[NAN] Expose NAN characteristics as an API" 2016-10-06 04:45:29 +00:00
Etan Cohen
e64c62fd02 [NAN] Expose NAN characteristics as an API
Expose NAN characteristics as an API.

(cherry-pick of commit 3a9de10963d869fa8f721432ce12785de384c560)

Bug: 31912101
Test: build and validate API updates
Change-Id: If02942d738aab8fa2f2f47489c6840af1bc38280
2016-10-05 20:00:53 -07:00
Etan Cohen
ee1e81ec5d Merge "[NAN] Add COARSE_LOCATION permission check to NAN discovery" 2016-10-06 02:06:36 +00:00
Etan Cohen
2a4c81b7a7 [NAN] Add COARSE_LOCATION permission check to NAN discovery
NAN discovery can expose location based on service signatures.

(cherry-pick of commit e1d8a5a6fc3661f226afff3fde59a3eb2c06d718)

Bug: 31907534
Test: unit test + integrated (sl4a) testing
Change-Id: Iec0fae507dfdae65fe08ab6e2ddb89334c15def5
2016-10-05 15:23:21 -07:00
Andreas Huber
5d49f802a4 Merge "Start hw-binder threadpool on HwBinder.getService() call." 2016-10-05 22:18:04 +00:00
Andreas Huber
781c083f32 Start hw-binder threadpool on HwBinder.getService() call.
Bug: 31961648
Test: hidl_test_java
Change-Id: I6caf778ab78a875427a17e1758ab724836c8d34e
2016-10-05 11:10:26 -07:00
Jordan Liu
f2456cb127 Add key to CarrierConfigManager
Add KEY_DEFAULT_VM_NUMBER_STRING and default value. Note that default
vm number no longer needs to be a string array, as gid is handled
within the new carrier_configs. Also remove references to old config.
Merged-In: I56e4e3713c27f449fd892db501b6097c8c89c3c6

Bug: 29873049
Change-Id: I56e4e3713c27f449fd892db501b6097c8c89c3c6
2016-10-05 11:02:38 -07:00
Mark Salyzyn
834763b2ab jni: move security interfaces to private
Test: Compile & boot smoke
Bug: 19235719
Bug: 26552300
Bug: 31289077
Bug: 31456426
Change-Id: I09328bda5d58138ad222f082bdd3688a97df5b35
2016-10-05 08:04:46 -07:00
Edward Savage-Jones
b08a146617 Make PIN/password failed attempts dialog non-cancelable
This commit makes it harder for a users pocket to trigger an MDM
remote wipe, by setting the warning dialog to noncancelable.

With this change the pocket would first need to tap on OK before
being able to attempt to enter a PIN. This mirrors the existing
behaviour of both PIN and PUK warning dialogs.

Test: manual - enable an MDM set to trigger a wipe of the device/user
on unsucessful unlock attempts. Then incorrectly enter your PIN until
the warning dialog appears.  The dialog should only be dismissable
by pressing the 'OK' button.

Change-Id: I4d86af555a5d8b226ceffa4711bd5e277db93f1e
2016-10-05 16:55:24 +02:00
Neil Fuller
b04b5f697d Remove .mk lines that are just setting the default
1.8 is now the default unless targeting an old SDK.

Bug: 31944681
Test: make checkbuild
Change-Id: Ic8a50cfd332da8b84eb87207a3c2d2c9a9a58e99
2016-10-05 13:38:36 +01:00
Etan Cohen
141a2840e1 Merge "[NAN] Use NAN capability information to validate configurations" 2016-10-05 05:20:05 +00:00
Treehugger Robot
33d404efb0 Merge "Debug: Initialize local to false" 2016-10-05 04:34:57 +00:00
Andreas Gampe
ce71149cc3 Debug: Initialize local to false
Ensure that a later read always sees a well-defined value.

Bug: 31943543
Test: m
Change-Id: I654f7896bf1c07a67911196f8906007955f00b85
2016-10-04 19:35:50 -07:00
Etan Cohen
99997dc1ab [NAN] Use NAN capability information to validate configurations
Validate publish and subscribe configurations and message length using
the NAN configuration retrieved from the firmware.

(cherry-pick of commit 65eaa6d82170140b351d48342550a27c971d2a37)

Bug: 31912101
Test: unit tests
Change-Id: I0328cabf1aafb3f350c5fe38e6d03b0e002c693b
2016-10-04 18:37:19 -07:00
Jordan Liu
25b64aad01 Merge "Add editable_voicemail_number key to CarrierConfig" 2016-10-04 18:07:01 +00:00
Jordan Liu
529f8d7209 Merge "Remove config in frameworks/base" 2016-10-04 18:07:01 +00:00
Jakub Pawlowski
0278ab957a Fix connecting to profiles when bonding from local device (1/3)
When bond is created from Bluetooth Settings, profiles gets properly
auto connected when services are discovered. If pairing is done from any
other app, i.e. NFC app, the bond is not being recognized as initiated
from local device, and profiles are not connected.

This patch makes sure that if bonding is initiated, no matter from which
app, it will cause proper profiles to connect.

Bug: 30211618
Change-Id: I71131f33eb5b9db2f5b4a8737b191d541bf1fd3d
2016-10-04 17:29:37 +00:00
Peter Qiu
1e9dd72b64 wifi: WifiEnterpriseConfig: use ParcelUtil to parcelize key and certificates
Bug: 31834143
Test: frameworks/base/wifi/tests/runtest.sh

Change-Id: Ie013c0637e66fb970746ad8f80bca03515b72443
2016-10-04 10:18:50 -07:00
Peter Qiu
49f2684f31 wifi: add ParcelUtil for parcelizing non-parcelable objects
This CL adds the support for X509Certificate and PrivateKey objects.

Bug: 31834143
Test: frameworks/base/wifi/tests/runtest.sh

Change-Id: I1416a2aeeb0dfdd4a562d1a3b578addf55deb4ab
2016-10-04 10:18:44 -07:00
Wale Ogunwale
1a02a26838 Merge "Fix window animation flash issue" 2016-10-03 23:14:34 +00:00
Colin Cross
8f1011d584 Merge "Fix struct vs. class mismatch in forward definitions" 2016-10-03 20:16:17 +00:00
Adam Lesinski
126e022095 Merge "[AssetManager]:Fix thread race caused double free issue." 2016-10-03 20:07:37 +00:00
Igor Murashkin
4f66cb3f53 app_process: Forward -cp/-classpath to ART.
* No new functionality was added, this was already possible via
  -Djava.class.path=classpath
* However, this makes it a bit more compatible with other tools
  that use -cp to invoke the main class.
* Also update the benchmarks README for correct up-to-date vogar
  instructions.

Test: vogar --mode app_process --benchmark frameworks/base/core/tests/benchmarks/src/android/os/ParcelBenchmark.java
Bug: 31807538
Change-Id: Idb04600fed3dd955437ccac832617dcfd1b52b63
2016-10-03 11:08:42 -07:00
Tobias Thierer
01614e4e7f Merge "API changes for Locale to OpenJDK8u60 (part 1/2)" 2016-10-03 13:41:48 +00:00
Qiushi Han
32fed96632 Fix window animation flash issue
The original logic cuts down the mShownPosition, causing 1 pixel offset,
sometimes this will cause flash.

To fix this, Use Math.round() instead.

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

Change-Id: I8a2fe55a2df6eaa9eda4ba78966a74ea492ab8ea
2016-10-01 17:32:28 +08:00
Colin Cross
08f5f1f03a Fix struct vs. class mismatch in forward definitions
The warnings were being hidden by the use of -isystem to include
frameworks/native/include.

Bug: 31752268
Test: m -j
Change-Id: Ib7227295e7b94c79cdc52e19c71be4066a11cedc
2016-09-30 21:07:26 -07:00
Brad Ebinger
51b9834180 Transplant the Logging system from Telecom
This change is the preliminary transplant of the functionality from
Telecom into android.telecom. It is currently not being used
anywhere and is not hooked into Telecom yet. It will be after this
change is committed.

Test: Refactoring CL. Existing tests still pass
Bug: 26571395
Change-Id: I406975e686c6eaab7e31b1efa426b3406c8e90cf
2016-09-30 15:01:01 -07:00
Etan Cohen
e3d5fa1094 Merge changes from topic 'cherry-pick'
* changes:
  [NAN] Register WIFI_NAN_STATE_CHANGED as protected broadcast
  [NAN] Update API javadoc to clarify NAN status change broadcast scope
2016-09-30 20:45:02 +00:00
Tao Bao
42d25b5992 Merge "Handle the race condition when calling uncrypt services." 2016-09-30 20:30:43 +00:00