285372 Commits

Author SHA1 Message Date
fionaxu
b50183d2fd Handle invalid destination address gracefully
Bug: 37578305
Test: runtest --path frameworks/opt/telephony/tests/telephonytests/src/com/android/internal/telephony/gsm/GsmSmsDispatcherTest.java --test-method testSendTextWithInvalidDestAddr
Change-Id: I2e79acb66178586d29dc89ad018f2726ed654a85
2017-08-08 16:41:23 -07:00
Jakub Pawlowski
15658662fd Merge "Bluetooth: move AIDL files related to bluetooth into system/bt (1/2)" 2017-08-08 22:39:31 +00:00
Jakub Pawlowski
6732625aa0 Bluetooth: move AIDL files related to bluetooth into system/bt (1/2)
This patch moves *.aidl files from
frameworks/base/core/java/android/bluetooth into system/bt/binder. This
is in preparation to convert the Bluetooth deamon into native
implementation piece by piece.
In order to do that, one must have C++ header files, and paths to them
with AIDL files, and */java/* folder didn't seem as proper place for
that. Additionally, keeping AIDL files out of framework/base will not
require creating dependency on this huge project, which should help
keeping the compilation fast.

Test: compilation test
Change-Id: I9a6db8832c9ec3215c648e325d67278832ef22cc
Merged-In: I9a6db8832c9ec3215c648e325d67278832ef22cc
(cherry picked from commit 06ae9c665b6fce7a748c3d7175359bff8343768c)
2017-08-08 12:38:37 -07:00
Treehugger Robot
43ee2ac140 Merge "Add null check for Wi-Fi command" 2017-08-08 18:03:14 +00:00
Calin Juravle
89d087886d Merge "Update DexLoadReporter to comply with the new reporting API" 2017-08-08 17:03:21 +00:00
Treehugger Robot
c06dbc114f Merge "DO NOT MERGE Fix some broken tests in frameworks-net with native dependencies" 2017-08-08 08:30:03 +00:00
Hugo Benichi
05be68698b Merge "Connectivity OWNERS: let owners modify Android.mk" 2017-08-08 07:20:07 +00:00
Treehugger Robot
2cbce2cb27 Merge "Fix flaky IpPrefixTest." 2017-08-08 07:16:48 +00:00
Treehugger Robot
0a00151bd1 Merge "Add OWNERS to com.android.server.net" 2017-08-08 07:07:25 +00:00
Hugo Benichi
4478840931 DO NOT MERGE Fix some broken tests in frameworks-net with native dependencies
Rational for do not merge: the list of native libraries needed in
Android.mk is not consistent at the moment for aosp master and for
internal branches. Furthermore it is not consistent within internal
branches either. This patch only attempts to fix the tests of the
branches where it matters for development. Otherwise the cost of merge
conflicts makes it undesirable.

Test: All tests in runtest frameworks-net pass.
Merged-In: Ie0b8baa38ca39e92fbd698ebcead86dac0a67708

(cherry pick from commit 99e8ab6e46eec5dbd1b059b3732672d537b3cf34)

Change-Id: Ic732b3dafc3497235e455b8748ac4f99cf02b221
2017-08-08 16:06:54 +09:00
Hugo Benichi
e4d461c0c8 Add OWNERS to com.android.server.net
Test: build
Change-Id: I9236489814103ab20b077ebfc30155dcdb66d411
2017-08-08 16:06:53 +09:00
Hugo Benichi
41494c10e6 Fix flaky IpPrefixTest.
Test: IpPrefixTest passes
Bug: 32561414
Merged-In: Ib4bffe9d33a6d4f5c2bd97798073de0f66d77645

(cherry pick from commit 32c687040301cb3601fd110281a742159a963aa9)

Change-Id: Ibaf11aae9b13af868bebff820c9e7615b63c8eb2
2017-08-08 14:54:08 +09:00
Hugo Benichi
afd2346bcc Connectivity OWNERS: let owners modify Android.mk
Since per-file overwrites the directory default, just allowing
build.master@android.com for Android.mk with a per-file rule prevents
the owners of the directory to modify Android.mk files without bypassing
OWNERS check in gerrit.

This patch fixes this issue for Connectivity OWNERS files by explicitly
listing Connectivity members for a few Android.mk files.

Test: build
Change-Id: I9c2a2519c3e7dd27e66334b090e074968b408cbc
2017-08-08 10:46:57 +09:00
Treehugger Robot
5724841581 Merge "Use class retention for VisibleForTesting annotations" 2017-08-07 19:17:33 +00:00
Colin Cross
5be3cbad27 Use class retention for VisibleForTesting annotations
The VisibleForTesting annotations are used by proguard to prevent
stripping code that is needed at runtime for tests.  The annotations
were marked with source retention, which worked fine with Jack's
proguard implementation.  When we switched back to javac + proguard,
the VisibleForTesting annotations are gone by the time proguard
sees the classes, so the annotated classes and methods can still
be stripped.

Move the VisibleForTesting annotation to class retention, which
matches guava's equivalent annotation.

Bug: 64365384
Test: m -j MtpDocumentsProvider &&
      javap -cp out/target/common/obj/APPS/MtpDocumentsProvider_intermediates/classes-proguard.jar com.android.mtp.MtpRoot

Change-Id: I63a467c2f0a21383eb9e4c9563fd6de2d994a373
Merged-In: I63a467c2f0a21383eb9e4c9563fd6de2d994a373
(cherry picked from commit 8e846143ddc285117d391561de7abd670078d27f)
2017-08-07 11:07:15 -07:00
Treehugger Robot
935e0c996a Merge "Add dirty_image_objects file." 2017-08-05 00:55:48 +00:00
Hugo Benichi
7575ec2240 Merge "NetworkCapabilities: fix describeImmutableDifferences" 2017-08-05 00:43:20 +00:00
Steven Moreland
e1b407d62e Merge "services.core: remove use of -static hidl java" 2017-08-04 19:14:48 +00:00
Colin Cross
b080b22a17 Merge "Move inserted method after end of try block" 2017-08-04 15:54:24 +00:00
Hugo Benichi
2ecb9408f4 NetworkCapabilities: fix describeImmutableDifferences
This patch fixes the mask used in describeImmutableDifferences which did
not correctly turn NET_CAPABILITY_NOT_METERED into bit flag.

Bug: 63326103
Test: added unit tests, runtest frameworks-net
Change-Id: Ib6b390b1daef5912859302692af7dcd6cfd3e39a
2017-08-04 15:17:40 +09:00
Colin Cross
cebc382d5f Move inserted method after end of try block
Methods inserted at the end of a synchronized {} block also need to
be outside of the implicit try{} block.  Make sure the next
instruction is the virtual end label for the try block, and put
the inserted method after the label.

Bug: 64301866
Test: locked_region_code_injection test
Test: m -j checkbuild
Change-Id: I6626aa45580b4df692e02fc6127a2947a6075e2e
2017-08-03 20:55:37 -07:00
Calin Juravle
cd8fbd25d3 Update DexLoadReporter to comply with the new reporting API
This is a partial cherry pick of commit
3bec94d78b0a66c4fa5cebd851ea33bcc51916b0.

It is partial because it only adapts DexLoadReporter to use the new
reporter BaseDexClassLoader.Reporter API.

Bug: 38138251
Test: make
Merged-In: I2486522fb811f9fc58a44b92642f43a41e7d5bac

(cherry picked from commit 3bec94d78b0a66c4fa5cebd851ea33bcc51916b0)

Change-Id: I4c41dbeb8a9297caac8b0eb936cf74832569f33e
2017-08-03 15:28:36 -07:00
Steven Moreland
be4b610d98 services.core: remove use of -static hidl java
These libraries are being removed. Now, the regular java
library can be used as both a static and non-static library,
we are removing these duplicate libraries which cause
several types problems (such as undefined behavior when
both the static and non-static libs are loaded).

Bug: 36376126
Test: boot marlin device
Merged-In: I6acb6a41fd5c62a3070ada373aed11706c423463
Change-Id: Ic3a62e7be36b1efca10a9e2e2d0efc430578d061
2017-08-03 15:19:03 -07:00
Jeff Hao
6aa5d715b4 Add dirty_image_objects file.
Allows grouping of classes with dirty static fields to be grouped
together in the image to have fewer dirty pages.

(cherry-picked from commit 37641ae54ab72509276d0fdd3f0fabeea9988c4a)

Bug: 62554875
Test: mm test-art-host

Merged-In: I6a36120235ee4f47bc1cb1ddc4413cfc561cb9a7
Change-Id: I6a36120235ee4f47bc1cb1ddc4413cfc561cb9a7
2017-08-03 11:02:02 -07:00
Treehugger Robot
5027dd1026 Merge "Notify the user and turn off tethering when the service is disallowed." 2017-08-03 10:29:55 +00:00
Przemyslaw Szczepaniak
82d2bd4e40 Merge "Revert "Revert "Default 'persist.sys.timezone' property to GMT if not set on init.""" 2017-08-03 10:15:24 +00:00
Treehugger Robot
27b56eb03f Merge "Fix compile issue" 2017-08-02 23:25:32 +00:00
Treehugger Robot
41a7f5a64f Merge "com.android.server: use proper nativehelper headers" 2017-08-02 23:02:04 +00:00
John Reck
83a2c63f0e Fix compile issue
Change-Id: Ic3423cfb23c6057210efb2e9110551b694c0101c
(cherry picked from commit 9688a3d33451134d6ff54f7b60f8db7a338a40f1)
2017-08-02 15:04:07 -07:00
Treehugger Robot
b14694b043 Merge "zygote: always log process exit reason." 2017-08-02 21:50:44 +00:00
Steven Moreland
f91ca58ec4 com.android.server: use proper nativehelper headers
libnativehelper exports headers under nativehelper. These were
available before incorrectly as global headers in order to give
access to jni.h.

Test: com.android.server finds headers
Bug: 63762847
Merged-In: Icb3018f520004f65e8dd565d6e1d563551548eba
Change-Id: Ib36fec53c30760af5dac4097b3eceda6c4c6c7f0
2017-08-02 14:19:20 -07:00
Josh Gao
6d747cacae zygote: always log process exit reason.
Multiple people have run into problems where apps disappear without a
trace. Always log process exit, so that it's clear when a process is
intentionally exiting. (The amount of extraneous logging this generates
is probably minimal.)

Test: none
Change-Id: I77169da4d0f05dabfe38490757975ad7ad0247b2
2017-08-02 12:54:05 -07:00
Treehugger Robot
8773730cd9 Merge "Add owners for the network security config" 2017-08-02 17:10:11 +00:00
Treehugger Robot
49e2a9a612 Merge "Add hwbinder library" 2017-08-02 16:46:42 +00:00
Treehugger Robot
8c9e5c81ad Merge "Delete dead code function SpotShadow::makeClockwise" 2017-08-02 16:29:23 +00:00
Jonathan Basseri
85a215bae7 Merge "Revert "Move getNetworkCountryIso impl from TM to PIM."" 2017-08-02 01:44:09 +00:00
Jonathan Basseri
379128e5c2 Revert "Move getNetworkCountryIso impl from TM to PIM."
This reverts commit 6f4657363cac93ddcc718d9716e3b138f770f2e2.

Change-Id: Ie0062369198af03441c531cd2181ed9c12b8f012
2017-08-02 01:10:47 +00:00
Stan Iliev
2db5825d25 Delete dead code function SpotShadow::makeClockwise
Delete SpotShadow::makeClockwise, which is unused and does
not link when compiler optimizations are disabled (for debugging).
SpotShadow::makeClockwise calls non-existent function
ShadowTessellator::isClockwise, which only works because the
optimizer deletes the function.

Change-Id: Ib8a014bf168782772faa1da7d75a079c1fd28ed9
(cherry picked from commit fdb625a309755fb762c448dd8c2c4e3a7cc26021)
2017-08-01 18:05:12 -07:00
Chad Brubaker
1ec48fc770 Add owners for the network security config
Test: build/make/tools/checkowners.py -c -v OWNERS
Change-Id: I9bb8f5ceaae4a1af8c93f5416a6a5cea42915c62
2017-08-01 15:50:22 -07:00
Jonathan Basseri
58bbef15d8 Merge "Move getNetworkCountryIso impl from TM to PIM." 2017-08-01 22:25:28 +00:00
Jonathan Basseri
6f4657363c Move getNetworkCountryIso impl from TM to PIM.
This moves the implementation of getNetworkCountryIso from
TelephonyManager into PhoneInterfaceManager so that we can perform an
additional IWLAN check.

Bug: 63050313
Test: no compilation errors
Change-Id: I8463af8ed427b73b57a4076c0ff79f055c697657
2017-08-01 22:24:05 +00:00
Ruchi Kandoi
7770adf755 Merge "Set default value for T3T_PMM." 2017-08-01 20:30:50 +00:00
Love Khanna
0b5a37e876 Set default value for T3T_PMM.
If HCEF Application does not provide the T3T PMM value, set the
default value (FFFFFFFFFFFFFFFF) as per NCI specification.

Bug: 64112415
Test: CTS Verifier; HCE-F Reader/Emulator Test
Change-Id: I24f212d9bebd978342e4dd04d618572132e7eb4b
2017-08-01 17:26:21 +00:00
Przemyslaw Szczepaniak
fbe00fa62b Revert "Revert "Default 'persist.sys.timezone' property to GMT if not set on init.""
This reverts commit 27c461ab3c683ecb9cce7a0b1950672371b3079f.

I'm taking alternative approach, telephony code will treat "GMT" value as it would be unset. This is fine because GMT is a synthetic value that would never be set from other sources. 

Change-Id: I889a844bfd75b7730a5d967065d27de03ef3ce2f
Test: flashed device, tested manually 
Bug: 64056758
2017-08-01 11:48:03 +00:00
Sundong Ahn
28cc6e88fd Add hwbinder library
HAL impls will depend hwbinder.jar instead of framework.jar on
build-time, but on runtime framework.jar will be used.

This is to cut the circular dependency when using configstore from
Android framework. Also added JNI call to HwBinder.java to cut
configstore's dependency on systemproperty in framework.jar.

Note that hwbinder.jar is LOCAL_UNINSTALLABLE_MODULE and so it won't be
installed in an actual image.

Bug: 35771640
Test: build & run
Change-Id: I2420298cf9df5d6bbcead3e4451b703ce9bc3e29
2017-08-01 11:26:18 +09:00
Neil Fuller
01d686b85e Merge "Remove redundant TODOs from PackageTracker" 2017-07-31 12:51:05 +00:00
Treehugger Robot
f60a38e152 Merge "Logging improvements when NetworkCapabilities change" 2017-07-31 01:38:29 +00:00
Hugo Benichi
eae7a22944 Logging improvements when NetworkCapabilities change
This patch improves the wtf() logging in updateCapabilities to
better distinguish between the cases of a changed specifiers, changed
transports, or changed capabilities. The case of NOT_METERED being added
or removed is ignored.

Bug: 63326103
Test: runtest frameworks-net, runtest frameworks-wifi
Merged-In: I05c6e78891e1eac658f1cf883223af520a9a4f8f
Merged-In: I4f6cbc0adb461cef6610460daeba72ca38b8f10c
Merged-In: I165a8bbe8362100f1e2bb909459fb45b1c68d5ae
Merged-In: Iec6d92e9a3a12bab87c5adfaf17f776465077060
Merged-In: I633d6347a7f852c27c03fc96b36ca2a60f70c73c
Merged-In: I38739184fc0db105bfd3b4c02cce01e803739e5d
Merged-In: Ia58b877056e2442136cc8b145ac8f4e6560cfc2c

(cherry pick from commit 683ea489d302b494ab40c0d5dc97d352a59d8aa9)

Change-Id: Id32ca66068c8ff549627e8e8c0e50897ef928c58
2017-07-31 09:25:37 +09:00
Neil Fuller
6f14377e21 Remove redundant TODOs from PackageTracker
The permission checks are either not required (for the data app)
or have been moved to validateUpdaterAppManifest()
(for the updater app).

Bug: 64142062
Test: make droid
Change-Id: Ie1791d64484f53ea2c2476f866fbd75358960de3
2017-07-28 17:35:24 +01:00
Treehugger Robot
a50e17aea2 Merge "Un-hide the MBMS streaming APIs" 2017-07-28 02:31:52 +00:00