OSDN Git Service
Treehugger Robot [Fri, 14 Oct 2016 02:21:10 +0000 (02:21 +0000)]
Merge "Fix static-analyzer warning."
Treehugger Robot [Fri, 14 Oct 2016 01:25:10 +0000 (01:25 +0000)]
Merge "Fix Bluetooth OOB pairing not working for unseen devices"
George Burgess IV [Wed, 12 Oct 2016 00:51:10 +0000 (17:51 -0700)]
Fix static-analyzer warning.
frameworks/base/tools/aapt/Images.cpp:845:17: warning: Assigned value is
garbage or undefined
row += bpp;
Bug: None.
Test: The warning is gone.
Change-Id: Idf4623d2510111a9188ed39922e109a8db225c76
Svetoslav Ganov [Thu, 13 Oct 2016 20:06:37 +0000 (20:06 +0000)]
Merge "Allow SetupWizard to do WiFi scans if location off"
Treehugger Robot [Thu, 13 Oct 2016 13:00:45 +0000 (13:00 +0000)]
Merge "Fix memory leak of Dnd tile"
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:05:32 +0000 (22:05 +0000)]
Merge "Add free short codes for direct carrier billing and others"
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 14:52:48 +0000 (14:52 +0000)]
Merge "RRO: Synchronize access to overlays.list"
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
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
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
Brad Ebinger [Tue, 11 Oct 2016 22:24:15 +0000 (22:24 +0000)]
Merge "Transplant the Logging system from Telecom"
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>
Jakub Pawlowski [Mon, 18 Jul 2016 16:18:09 +0000 (09:18 -0700)]
Fix Bluetooth OOB pairing not working for unseen devices
When Out Of Band info is provided, first time we learn about
device is when it's state is changed to "Bonding". This currently cause
this event to be discarded and pairing fails. Instead, we should add
CachedDevice object for newly added device.
Bug:
30188629
Change-Id: I4046bfe30e8bf32b888f608ac06d5041e2999dc9
Christopher Wiley [Mon, 10 Oct 2016 22:31:33 +0000 (22:31 +0000)]
Merge "IndexOutOfBoundsException observed in ProcessStats"
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: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
Treehugger Robot [Mon, 10 Oct 2016 21:02:29 +0000 (21:02 +0000)]
Merge "Debug: Use UniqueFile"
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
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
Treehugger Robot [Fri, 7 Oct 2016 15:03:01 +0000 (15:03 +0000)]
Merge "jni: move security interfaces to private"
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:34:41 +0000 (08:34 +0000)]
Merge "Relax namespace restriction on system server classloader"
Treehugger Robot [Fri, 7 Oct 2016 00:37:50 +0000 (00:37 +0000)]
Merge "Debug: Add test for bug
31943543"
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 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
Treehugger Robot [Thu, 6 Oct 2016 17:35:32 +0000 (17:35 +0000)]
Merge "wifi: WifiEnterpriseConfig: use ParcelUtil to parcelize key and certificates"
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:31:33 +0000 (08:31 +0000)]
Merge "Remove .mk lines that are just setting the default"
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:06:36 +0000 (02:06 +0000)]
Merge "[NAN] Add COARSE_LOCATION permission check to NAN discovery"
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:20:05 +0000 (05:20 +0000)]
Merge "[NAN] Use NAN capability information to validate configurations"
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: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:14:34 +0000 (23:14 +0000)]
Merge "Fix window animation flash issue"
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: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
Brad Ebinger [Thu, 22 Sep 2016 23:30:46 +0000 (16:30 -0700)]
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
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:30:42 +0000 (20:30 +0000)]
Merge "Handle the race condition when calling uncrypt services."
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: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:43:17 +0000 (08:43 +0000)]
Merge "Add new StrictMode thread policy - DETECT_UNBUFFERED_IO"
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
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:50:14 +0000 (22:50 +0000)]
Merge "Remove migrated config_carrier_wfc_ims_available"
Christopher Ferris [Wed, 28 Sep 2016 21:24:41 +0000 (14:24 -0700)]
Fix code for new malloc debug enable.
When using am dumpheap -n, modify the code to print the new
way malloc debug works instead of the old way.
Also, the old code had a hard-coded number of backtrace frames. The
new code allows this to be variable so the code needed to be modified
for this too.
Test: am dumpheap -n <PID> <FILE> dumps properly.
Change-Id: Id79e4acbe04313090eb2b973f023e5b27591bb7d
Randy Pan [Thu, 29 Sep 2016 20:04:39 +0000 (13:04 -0700)]
Remove the obsoleted ScanResult.isAutoJoinCandidate
Bug:
31565767
Test: unit tests
Change-Id: I3e1ee0e919c800c4d5eeaf94fdc68123b6de542e
Treehugger Robot [Thu, 29 Sep 2016 19:17:36 +0000 (19:17 +0000)]
Merge "Clear pending activity launches when force stop package"
Jordan Liu [Thu, 29 Sep 2016 17:15:04 +0000 (17:15 +0000)]
Merge "Add cdma_3waycall_flash_delay key to CarrierConfig"
Jordan Liu [Thu, 29 Sep 2016 17:15:04 +0000 (17:15 +0000)]
Merge "Remove configs in frameworks/base"
liulvping [Mon, 26 Sep 2016 12:00:15 +0000 (20:00 +0800)]
Clear pending activity launches when force stop package
https://code.google.com/p/android/issues/detail?id=223731
It is possible that an activity in pending launches be resumed while
it's package was stopped by some other reason, like uninstall pkg.
Merged-In: I130ded89cee162aa59ac2bf330f026e49e16ef69
Change-Id: I130ded89cee162aa59ac2bf330f026e49e16ef69
Signed-off-by: liulvping <liulvping@xiaomi.com>
Shubham Ajmera [Thu, 29 Sep 2016 15:35:36 +0000 (16:35 +0100)]
Add new StrictMode thread policy - DETECT_UNBUFFERED_IO
This will enable the developers to check if they could replace an unbuffered
I/O operation with a corresponding buffered I/O operation.
The policy can be set as follow:
StrictMode.setThreadPolicy(new StrictMode.ThreadPolicy.Builder()
.detectUnbufferedIO().build());
Test: vogar BlockGuardTest
Bug:
3018772
Change-Id: Ib804a8e9980ae40abfd216f8b87c250fd413bd5c
(cherry picked from commit
9b7184a8fd6c940872f1526667dd7933db4bdd5f)w
Neil Fuller [Thu, 29 Sep 2016 13:08:30 +0000 (13:08 +0000)]
Merge "Fix AnnotatedElement.getDeclaredAnnotation() generic signature"
Neil Fuller [Thu, 29 Sep 2016 13:07:44 +0000 (13:07 +0000)]
Merge "Unhide constants related to type annotations"
Shinji Sogo [Mon, 2 Nov 2015 01:15:52 +0000 (10:15 +0900)]
Don't compare FQDN with providerFriendlyName
FQDN and providor friendly name are obviously different, and if they're
compared they're almost always unmatched. FQDN of current configuration
should be checked with FQDN of new configuration.
Bug:
31815374
Test: Test with the device
Change-Id: I6c8c8ca07b4abb038175e3999d387f0869ec7391
Treehugger Robot [Thu, 29 Sep 2016 05:00:42 +0000 (05:00 +0000)]
Merge "Reset mCurrentUserId when fingerprintd died"
Jordan Liu [Wed, 31 Aug 2016 19:18:20 +0000 (12:18 -0700)]
Remove migrated config_carrier_wfc_ims_available
config_carrier_wfc_ims_available has already been migrated to
CarrierConfig. This commit removes reference to this carrier config from
non-prebuilt config files.
Merged-In: I74a3296494377e771d5d451db62c554485bbeb98
Merged-In: If47b743547b55e2ff3daf0357372a5d398c8b6ab
Bug:
29873049
Change-Id: I1cbfd074cdde67db6ad2a800198ac0fab37aecf0
Treehugger Robot [Thu, 29 Sep 2016 00:00:49 +0000 (00:00 +0000)]
Merge changes from topic 'cherry_ota_dexopt'
* changes:
OtaDexopt: Fix after-ota space measure
OtaDexoptService: Add tron logging
OtaDexopt: Downgrade apps when low on space
Installer: Support delete_odex command
Package Manager: Sort list of packages to dexopt
Jordan Liu [Wed, 28 Sep 2016 23:59:20 +0000 (23:59 +0000)]
Merge "Remove dial_string_replace configs"
Jordan Liu [Wed, 28 Sep 2016 23:58:34 +0000 (23:58 +0000)]
Merge "Add dial_string_replace key to CarrierConfig"