OSDN Git Service
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
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"
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
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:53:48 +0000 (21:53 +0000)]
Merge "Rely on the platform -std default."
am:
66f15cc01b
Change-Id: I8930911314a16c499c6c8ea1b005e3c3ea7d95fa
Treehugger Robot [Sat, 8 Oct 2016 21:45:16 +0000 (21:45 +0000)]
Merge "Rely 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
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
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
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
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
Treehugger Robot [Fri, 7 Oct 2016 15:03:01 +0000 (15:03 +0000)]
Merge "jni: move security interfaces to private"
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
Treehugger Robot [Fri, 7 Oct 2016 11:09:26 +0000 (11:09 +0000)]
Merge "Make PIN/password failed attempts dialog non-cancelable"
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
Dimitry Ivanov [Fri, 7 Oct 2016 08:34:41 +0000 (08:34 +0000)]
Merge "Relax namespace restriction on system server classloader"
Andreas Gampe [Fri, 7 Oct 2016 00:45:14 +0000 (00:45 +0000)]
Merge "Debug: Add test for bug
31943543"
am:
7c4efe421c
Change-Id: I4d1a78aa19473e29a121e20ec8c4e07dd202da89
Treehugger Robot [Fri, 7 Oct 2016 00:37:50 +0000 (00:37 +0000)]
Merge "Debug: Add test for bug
31943543"
Miao Wang [Thu, 6 Oct 2016 21:15:07 +0000 (21:15 +0000)]
Merge "Correctly pass number of input allocations for BLAS"
am:
8d08d0fa83
Change-Id: Ia2624e12f3122119814f082f24e02052a19ecd9c
Treehugger Robot [Thu, 6 Oct 2016 21:04:56 +0000 (21:04 +0000)]
Merge "Correctly pass number of input allocations for BLAS"
Jakub Pawlowski [Thu, 6 Oct 2016 21:00:51 +0000 (21:00 +0000)]
Merge "Fix connecting to profiles when bonding from local device (1/3)"
am:
44c013d739
Change-Id: I4cc9e7c960e51ec49fcaf3f16968afac7b6cc471
Jakub Pawlowski [Thu, 6 Oct 2016 20:54:07 +0000 (20:54 +0000)]
Merge "Fix connecting to profiles when bonding from local device (1/3)"
Andreas Gampe [Thu, 6 Oct 2016 20:49:52 +0000 (13:49 -0700)]
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
Miao Wang [Thu, 6 Oct 2016 17:45:42 +0000 (10:45 -0700)]
Correctly pass number of input allocations for BLAS
Bug:
31992305
Test: Build and CTS RsBlas test pass on Angler.
Change-Id: If49c0be003d9c2a2175924dc3303703b9ab49357
Peter Qiu [Thu, 6 Oct 2016 17:45:22 +0000 (17:45 +0000)]
Merge "wifi: WifiEnterpriseConfig: use ParcelUtil to parcelize key and certificates"
am:
05d950ee3b
Change-Id: I8c7766d9c2d0ce6bcc761c5087b27a9c7acc1b51
Treehugger Robot [Thu, 6 Oct 2016 17:35:32 +0000 (17:35 +0000)]
Merge "wifi: WifiEnterpriseConfig: use ParcelUtil to parcelize key and certificates"
Peter Qiu [Thu, 6 Oct 2016 17:32:51 +0000 (17:32 +0000)]
Merge "wifi: add ParcelUtil for parcelizing non-parcelable objects"
am:
0169a3b094
Change-Id: I6e83e3a609daa1e77b0edf4ff1843c961ee54831
Treehugger Robot [Thu, 6 Oct 2016 17:21:44 +0000 (17:21 +0000)]
Merge "wifi: add ParcelUtil for parcelizing non-parcelable objects"
Neil Fuller [Thu, 6 Oct 2016 08:37:54 +0000 (08:37 +0000)]
Merge "Remove .mk lines that are just setting the default"
am:
8873c3821d
Change-Id: Ic3a02567b2983da067cccc9ce38a2e29ef3834b6
Neil Fuller [Thu, 6 Oct 2016 08:31:33 +0000 (08:31 +0000)]
Merge "Remove .mk lines that are just setting the default"
Etan Cohen [Thu, 6 Oct 2016 04:51:12 +0000 (04:51 +0000)]
Merge "[NAN] Expose NAN characteristics as an API"
am:
f12c6e4f5e
Change-Id: I842c7503eeb6d70c941e3097dae0207661cc906e
Etan Cohen [Thu, 6 Oct 2016 04:45:28 +0000 (04:45 +0000)]
Merge "[NAN] Expose NAN characteristics as an API"
Etan Cohen [Mon, 3 Oct 2016 22:14:51 +0000 (15:14 -0700)]
[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
Etan Cohen [Thu, 6 Oct 2016 02:12:22 +0000 (02:12 +0000)]
Merge "[NAN] Add COARSE_LOCATION permission check to NAN discovery"
am:
ee1e81ec5d
Change-Id: I606be878116457c91d3c036a4a0086207a5a6752
Etan Cohen [Thu, 6 Oct 2016 02:06:36 +0000 (02:06 +0000)]
Merge "[NAN] Add COARSE_LOCATION permission check to NAN discovery"
Andreas Huber [Wed, 5 Oct 2016 22:24:07 +0000 (22:24 +0000)]
Merge "Start hw-binder threadpool on HwBinder.getService() call."
am:
5d49f802a4
Change-Id: I155ec0240f1ddce7b9128646378f18bfee153b86
Etan Cohen [Mon, 3 Oct 2016 22:42:11 +0000 (15:42 -0700)]
[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
Andreas Huber [Wed, 5 Oct 2016 22:18:04 +0000 (22:18 +0000)]
Merge "Start hw-binder threadpool on HwBinder.getService() call."
Andreas Huber [Wed, 5 Oct 2016 18:10:26 +0000 (11:10 -0700)]
Start hw-binder threadpool on HwBinder.getService() call.
Bug:
31961648
Test: hidl_test_java
Change-Id: I6caf778ab78a875427a17e1758ab724836c8d34e
Mark Salyzyn [Tue, 4 Oct 2016 16:01:37 +0000 (09:01 -0700)]
jni: move security interfaces to private
Test: Compile & boot smoke
Bug:
19235719
Bug:
26552300
Bug:
31289077
Bug:
31456426
Change-Id: I09328bda5d58138ad222f082bdd3688a97df5b35
Edward Savage-Jones [Wed, 5 Oct 2016 08:29:02 +0000 (10:29 +0200)]
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
Neil Fuller [Wed, 5 Oct 2016 12:35:50 +0000 (13:35 +0100)]
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
Etan Cohen [Wed, 5 Oct 2016 05:24:47 +0000 (05:24 +0000)]
Merge "[NAN] Use NAN capability information to validate configurations"
am:
141a2840e1
Change-Id: I247e246a2e74b7940eb9b8f30bc1bdbe14c30574
Etan Cohen [Wed, 5 Oct 2016 05:20:05 +0000 (05:20 +0000)]
Merge "[NAN] Use NAN capability information to validate configurations"
Andreas Gampe [Wed, 5 Oct 2016 04:42:56 +0000 (04:42 +0000)]
Merge "Debug: Initialize local to false"
am:
33d404efb0
Change-Id: Ia6fdb36342a392d777da45f562d0173bdd4bebed
Treehugger Robot [Wed, 5 Oct 2016 04:34:57 +0000 (04:34 +0000)]
Merge "Debug: Initialize local to false"
Andreas Gampe [Wed, 5 Oct 2016 01:06:42 +0000 (18:06 -0700)]
Debug: Initialize local to false
Ensure that a later read always sees a well-defined value.
Bug:
31943543
Test: m
Change-Id: I654f7896bf1c07a67911196f8906007955f00b85
Etan Cohen [Mon, 3 Oct 2016 20:40:09 +0000 (13:40 -0700)]
[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
Jordan Liu [Tue, 4 Oct 2016 18:17:25 +0000 (18:17 +0000)]
Merge "Add editable_voicemail_number key to CarrierConfig"
am:
25b64aad01
Change-Id: If3ac600a1dbb0dc0aba65af49d271b333b7e6368
Jordan Liu [Tue, 4 Oct 2016 18:16:30 +0000 (18:16 +0000)]
Merge "Remove config in frameworks/base"
am:
529f8d7209
Change-Id: I20e8eef28b656fd60da84da00b9d9d566d3b340b
Jordan Liu [Tue, 4 Oct 2016 18:07:01 +0000 (18:07 +0000)]
Merge "Add editable_voicemail_number key to CarrierConfig"
Jordan Liu [Tue, 4 Oct 2016 18:07:01 +0000 (18:07 +0000)]
Merge "Remove config in frameworks/base"
Jakub Pawlowski [Wed, 20 Jul 2016 18:55:48 +0000 (11:55 -0700)]
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
Peter Qiu [Fri, 30 Sep 2016 21:19:34 +0000 (14:19 -0700)]
wifi: WifiEnterpriseConfig: use ParcelUtil to parcelize key and certificates
Bug:
31834143
Test: frameworks/base/wifi/tests/runtest.sh
Change-Id: Ie013c0637e66fb970746ad8f80bca03515b72443
Peter Qiu [Fri, 30 Sep 2016 18:24:38 +0000 (11:24 -0700)]
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
Wale Ogunwale [Mon, 3 Oct 2016 23:20:52 +0000 (23:20 +0000)]
Merge "Fix window animation flash issue"
am:
1a02a26838
Change-Id: Ib68ce77146e653b95cec215e4a80aaa0fb106ad2
Wale Ogunwale [Mon, 3 Oct 2016 23:14:34 +0000 (23:14 +0000)]
Merge "Fix window animation flash issue"
Colin Cross [Mon, 3 Oct 2016 20:23:40 +0000 (20:23 +0000)]
Merge "Fix struct vs. class mismatch in forward definitions"
am:
8f1011d584
Change-Id: I259197408884f11e61f61e5241ee0012de28b54f
Adam Lesinski [Mon, 3 Oct 2016 20:18:52 +0000 (20:18 +0000)]
Merge "[AssetManager]:Fix thread race caused double free issue."
am:
126e022095
Change-Id: I9928064b4811579bd50d4eeaff98bd4200b8bc7b
Colin Cross [Mon, 3 Oct 2016 20:16:16 +0000 (20:16 +0000)]
Merge "Fix struct vs. class mismatch in forward definitions"
Adam Lesinski [Mon, 3 Oct 2016 20:07:37 +0000 (20:07 +0000)]
Merge "[AssetManager]:Fix thread race caused double free issue."
Tobias Thierer [Mon, 3 Oct 2016 13:50:39 +0000 (13:50 +0000)]
Merge "API changes for Locale to OpenJDK8u60 (part 1/2)"
am:
01614e4e7f
Change-Id: Iaa1c3b284d4ff97799dd1939da34c088b95b7915
Tobias Thierer [Mon, 3 Oct 2016 13:41:48 +0000 (13:41 +0000)]
Merge "API changes for Locale to OpenJDK8u60 (part 1/2)"
Qiushi Han [Sat, 1 Oct 2016 09:06:49 +0000 (17:06 +0800)]
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
Colin Cross [Sat, 1 Oct 2016 00:36:46 +0000 (17:36 -0700)]
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
Etan Cohen [Fri, 30 Sep 2016 20:56:58 +0000 (20:56 +0000)]
Merge changes from topic 'cherry-pick'
am:
e3d5fa1094
Change-Id: I73321476de15f230ba19f04a5561238f0567eb9a
Etan Cohen [Fri, 30 Sep 2016 20:56:54 +0000 (20:56 +0000)]
[NAN] Register WIFI_NAN_STATE_CHANGED as protected broadcast
am:
720d175757
Change-Id: I5916af955c4452afe07a7fa35e8229aa53f56638
Etan Cohen [Fri, 30 Sep 2016 20:55:36 +0000 (20:55 +0000)]
[NAN] Update API javadoc to clarify NAN status change broadcast scope
am:
4c22e8bede
Change-Id: I42709b7829a32c0767c20f6273451c478492f97b
Etan Cohen [Fri, 30 Sep 2016 20:45:02 +0000 (20:45 +0000)]
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
Tao Bao [Fri, 30 Sep 2016 20:40:03 +0000 (20:40 +0000)]
Merge "Handle the race condition when calling uncrypt services."
am:
42d25b5992
Change-Id: Ia5d37580f8bf1489fcc5ccf9c74cf64b94858dc6
Tao Bao [Fri, 30 Sep 2016 20:30:42 +0000 (20:30 +0000)]
Merge "Handle the race condition when calling uncrypt services."
Jordan Liu [Fri, 30 Sep 2016 18:50:24 +0000 (18:50 +0000)]
Merge "Add config_carrier_wfc_ims_available to config.xml"
am:
d1d682e446
Change-Id: I78e496cd8d01f283cfb9a737b155b0dab4984b67
Jordan Liu [Fri, 30 Sep 2016 18:42:45 +0000 (18:42 +0000)]
Merge "Add config_carrier_wfc_ims_available to config.xml"
Etan Cohen [Thu, 29 Sep 2016 23:12:47 +0000 (16:12 -0700)]
[NAN] Register WIFI_NAN_STATE_CHANGED as protected broadcast
Broadcast can be registered protected (as in this CL) in which case they
are restricted to system apps. Broadcasts sent by the System Service must
be protected (so no one else can fake them).
The WIFI_NAN_STATE_CHANGED is sent by the System Service and no other apps
should be able to send them (e.g. to deny access to NAN to other apps).
(cherry-pick of commit
b8ce87175e3a865feaad7c6aa49226f768729540)
Bug:
31811154
Test: build & run - enable/disable Wi-Fi to trigger bug
Change-Id: I77ea18291d68c38a63d64a75affc6b7ea114e549
Etan Cohen [Thu, 29 Sep 2016 23:02:30 +0000 (16:02 -0700)]
[NAN] Update API javadoc to clarify NAN status change broadcast scope
(cherry-pick of commit
1fceaf9d63cd572cad57e71f6cb66f0cb59183b5)
Bug:
31675932
Test: make -j 32 update-api (to generate doc)
Change-Id: I7263a15902c423c1c71c2c457c82e8caef5abceb
Randy Pan [Fri, 30 Sep 2016 17:36:57 +0000 (17:36 +0000)]
Merge "Remove the obsoleted ScanResult.isAutoJoinCandidate"
am:
673b47f234
Change-Id: I79fda4350062d27c4399df80d7edca4df79152f2
Randy Pan [Fri, 30 Sep 2016 17:30:15 +0000 (17:30 +0000)]
Merge "Remove the obsoleted ScanResult.isAutoJoinCandidate"
Jordan Liu [Fri, 30 Sep 2016 16:43:49 +0000 (09:43 -0700)]
Add config_carrier_wfc_ims_available to config.xml
The migration of this config to CarrierConfig breaks the build on
certain devices, so we should leave the original config in.
Bug:
29873049
Change-Id: I2f526c37198359de7adec4cfd4c391ccaa8ab0be
Przemyslaw Szczepaniak [Fri, 30 Sep 2016 08:50:41 +0000 (08:50 +0000)]
Merge "Add new StrictMode thread policy - DETECT_UNBUFFERED_IO"
am:
c60c70dcf9
Change-Id: I33ffda7e4e0ef230a4de28560262339cea102ec4
Przemyslaw Szczepaniak [Fri, 30 Sep 2016 08:43:17 +0000 (08:43 +0000)]
Merge "Add new StrictMode thread policy - DETECT_UNBUFFERED_IO"
Christopher Ferris [Fri, 30 Sep 2016 01:09:43 +0000 (01:09 +0000)]
Merge "Fix code for new malloc debug enable."
am:
1efb3e93e6
Change-Id: Ifbab90962878670fdacfc7b308afa46dce898f6d
Treehugger Robot [Fri, 30 Sep 2016 01:01:02 +0000 (01:01 +0000)]
Merge "Fix code for new malloc debug enable."
Jordan Liu [Thu, 8 Sep 2016 19:45:58 +0000 (12:45 -0700)]
Add editable_voicemail_number key to CarrierConfig
Add KEY_EDITABLE_VOICEMAIL_NUMBER_BOOL and default value to
CarrierConfigManager, and remove the references to the old config in
core/res/res/values/[config.xml/symbols.xml]
This value exists to fix http://b/
14093735. If a SIM card has no
voicemail number available, since the default number is empty, we allow
users to edit the voicemail number when this flag is true.
Merged-In: I68a494e2176306e4e9181a8ccb0aa818f3e08154
Bug:
29873049
Change-Id: I68a494e2176306e4e9181a8ccb0aa818f3e08154
Jordan Liu [Thu, 29 Sep 2016 23:08:12 +0000 (23:08 +0000)]
Merge "fix branch break by adding carrierconfig key" into stage-aosp-master
Tao Bao [Tue, 27 Sep 2016 18:15:42 +0000 (11:15 -0700)]
Handle the race condition when calling uncrypt services.
We call uncrypt services to setup / clear bootloader control block (BCB)
for scheduling tasks under recovery (applying OTAs, performing FDR).
However, we cannot start multiple requests simultaneously. Because they
all use the same socket (/dev/socket/uncrypt) for communication and init
deletes the socket on service exits.
This CL fixes the issue by a) adding synchronized blocks for the service
requests; b) checking the availability of the socket before initiating a
new one.
Note that adding synchronized blocks to RecoverySystem doesn't help,
because the calls could be made from different processes (e.g. priv-app,
system_server).
Bug:
31526152
Test: FDR works while a priv-app keeps calling clear BCB.
Change-Id: I95308989e849a9c98a9503ac509f2bc51ed3de19
Jordan Liu [Thu, 8 Sep 2016 20:01:21 +0000 (13:01 -0700)]
Remove config in frameworks/base
Remove old config within frameworks/base. With move to CarrierConfig no
need for the old editable_voicemailnumber resources.
Merged-In: Ib70ac5f488b45f32b705e471478e13802ebe9dd7
Bug:
29873049
Change-Id: Ib70ac5f488b45f32b705e471478e13802ebe9dd7
Jordan Liu [Thu, 29 Sep 2016 22:57:28 +0000 (22:57 +0000)]
Merge "Remove migrated config_carrier_wfc_ims_available"
am:
5d71e2d671
Change-Id: Iaf50b529303f8449b776c33942175953ff0fc6e1
Jordan Liu [Thu, 29 Sep 2016 22:50:14 +0000 (22:50 +0000)]
Merge "Remove migrated config_carrier_wfc_ims_available"
Jordan Liu [Wed, 7 Sep 2016 19:01:24 +0000 (12:01 -0700)]
fix branch break by adding carrierconfig key
Add KEY_CDMA_3WAYCALL_FLASH_DELAY_INT and default value to
CarrierConfigManager
Bug:
29873049
Change-Id: I53dc93defbfa7d1366e6ee066638d73df03f88d0