Commit Graph

252382 Commits

Author SHA1 Message Date
George Burgess IV
0c2774b16a 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
2016-10-13 15:51:04 -07:00
Svetoslav Ganov
c98b34bdce Merge "Allow SetupWizard to do WiFi scans if location off" 2016-10-13 20:06:38 +00:00
Treehugger Robot
6057a8360a Merge "Fix memory leak of Dnd tile" 2016-10-13 13:00:45 +00:00
Selim Cinek
6f3a05ae77 Merge "DO NOT MERGE - Fixed an issue where the emergency affordance would show" 2016-10-13 00:48:24 +00:00
Treehugger Robot
d33e79c328 Merge "DO NOT MERGE - Added translations for emergency action string" 2016-10-13 00:45:20 +00:00
Selim Cinek
42a4338850 DO NOT MERGE - Added translations for emergency action string
Bug: 30404490
Change-Id: Ic20d93005882bb71cef32a705443e427b0a9bd71
2016-10-12 23:23:52 +00:00
Selim Cinek
4df8d64dab 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
2016-10-12 23:20:30 +00:00
Robert Greenwalt
73c50f7dbc Merge "Add free short codes for direct carrier billing and others" 2016-10-12 22:05:32 +00:00
Treehugger Robot
aae64557e1 Merge "Don't compare FQDN with providerFriendlyName" 2016-10-12 15:44:35 +00:00
Adam Lesinski
78382db820 Merge "RRO: Synchronize access to overlays.list" 2016-10-12 14:52:49 +00:00
Jorim Jaggi
6738617652 Merge "Fix split-screen flash issue" 2016-10-12 13:24:46 +00:00
Yuta Yamada
99fd277a47 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
2016-10-12 08:45:11 +00:00
Martin Wallgren
f12af5e907 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
2016-10-12 15:42:04 +09:00
Treehugger Robot
e011bf80c5 Merge "Tethering: check if configManager is null" 2016-10-12 03:48:03 +00:00
Svetoslav Ganov
c573661f4c 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
2016-10-12 02:58:26 +00:00
Rebecca Silberstein
87e8014117 Tethering: check if configManager is null
cherry-picked from b07f140904

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
2016-10-11 16:46:55 -07:00
Brad Ebinger
cbb03d1ad3 Merge "Transplant the Logging system from Telecom" 2016-10-11 22:24:15 +00:00
Matthew Campbell
ad378ef923 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>
2016-10-11 14:01:40 +01:00
Christopher Wiley
6408e2e5cc Merge "IndexOutOfBoundsException observed in ProcessStats" 2016-10-10 22:31:33 +00:00
Treehugger Robot
2dc11c0500 Merge "Fix SurfaceViewPositionListener race bugs" 2016-10-10 21:48:52 +00:00
Andre Eisenbach
5c043f51b0 Merge "List HF_INDICATORS_VALUE_CHANGED broadcast as protected" 2016-10-10 21:25:07 +00:00
Jack He
b798f79ba2 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
2016-10-10 21:24:55 +00:00
Treehugger Robot
546f755bf8 Merge "Debug: Use UniqueFile" 2016-10-10 21:02:29 +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
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
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 3a9de10963)

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 e1d8a5a6fc)

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