OSDN Git Service
Chen Xu [Wed, 9 Aug 2017 01:09:42 +0000 (01:09 +0000)]
Merge "Handle invalid destination address gracefully"
Jordan Liu [Wed, 9 Aug 2017 00:41:57 +0000 (00:41 +0000)]
Merge "Fix error message strings"
Treehugger Robot [Wed, 9 Aug 2017 00:00:43 +0000 (00:00 +0000)]
Merge "Fix graphical artifact in the fisheye effect"
Treehugger Robot [Tue, 8 Aug 2017 23:56:05 +0000 (23:56 +0000)]
Merge "Moved channels settings from carrier config to resources"
fionaxu [Tue, 20 Jun 2017 06:22:29 +0000 (23:22 -0700)]
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
Jordan Liu [Tue, 8 Aug 2017 23:06:17 +0000 (16:06 -0700)]
Fix error message strings
mmcc_imsi_unknown_in_hlr and mmcc_illegal_ms are updated to reflect
newly supported requirements.
Fixes:
64194949
Test: manual
Change-Id: I358ba1d562d30e958580003336ace3941bd5e04f
Jakub Pawlowski [Tue, 8 Aug 2017 22:39:31 +0000 (22:39 +0000)]
Merge "Bluetooth: move AIDL files related to bluetooth into system/bt (1/2)"
Jack Yu [Thu, 4 May 2017 18:50:51 +0000 (11:50 -0700)]
Moved channels settings from carrier config to resources
Since CBS channels are more countries specific instead
of carrier specific, moving it to resources makes
more sense.
Test: Manual
bug:
31223529
Merged-In: I251a55ba0b17a96ee545cad68558c1ee2c6a707c
Change-Id: I251a55ba0b17a96ee545cad68558c1ee2c6a707c
Jakub Pawlowski [Tue, 8 Aug 2017 11:27:20 +0000 (04:27 -0700)]
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)
Treehugger Robot [Tue, 8 Aug 2017 18:03:14 +0000 (18:03 +0000)]
Merge "Add null check for Wi-Fi command"
Calin Juravle [Tue, 8 Aug 2017 17:03:21 +0000 (17:03 +0000)]
Merge "Update DexLoadReporter to comply with the new reporting API"
Treehugger Robot [Tue, 8 Aug 2017 08:30:03 +0000 (08:30 +0000)]
Merge "DO NOT MERGE Fix some broken tests in frameworks-net with native dependencies"
Hugo Benichi [Tue, 8 Aug 2017 07:20:07 +0000 (07:20 +0000)]
Merge "Connectivity OWNERS: let owners modify Android.mk"
Treehugger Robot [Tue, 8 Aug 2017 07:16:48 +0000 (07:16 +0000)]
Merge "Fix flaky IpPrefixTest."
Treehugger Robot [Tue, 8 Aug 2017 07:07:25 +0000 (07:07 +0000)]
Merge "Add OWNERS to com.android.server.net"
Hugo Benichi [Fri, 4 Aug 2017 03:12:25 +0000 (12:12 +0900)]
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
Hugo Benichi [Mon, 7 Aug 2017 01:27:04 +0000 (10:27 +0900)]
Add OWNERS to com.android.server.net
Test: build
Change-Id: I9236489814103ab20b077ebfc30155dcdb66d411
Hugo Benichi [Thu, 10 Nov 2016 13:45:56 +0000 (22:45 +0900)]
Fix flaky IpPrefixTest.
Test: IpPrefixTest passes
Bug:
32561414
Merged-In: Ib4bffe9d33a6d4f5c2bd97798073de0f66d77645
(cherry pick from commit
32c687040301cb3601fd110281a742159a963aa9)
Change-Id: Ibaf11aae9b13af868bebff820c9e7615b63c8eb2
Hugo Benichi [Tue, 8 Aug 2017 01:46:57 +0000 (10:46 +0900)]
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
Treehugger Robot [Mon, 7 Aug 2017 19:17:33 +0000 (19:17 +0000)]
Merge "Use class retention for VisibleForTesting annotations"
Colin Cross [Fri, 4 Aug 2017 23:39:05 +0000 (16:39 -0700)]
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)
Treehugger Robot [Sat, 5 Aug 2017 00:55:48 +0000 (00:55 +0000)]
Merge "Add dirty_image_objects file."
Hugo Benichi [Sat, 5 Aug 2017 00:43:20 +0000 (00:43 +0000)]
Merge "NetworkCapabilities: fix describeImmutableDifferences"
Steven Moreland [Fri, 4 Aug 2017 19:14:48 +0000 (19:14 +0000)]
Merge "services.core: remove use of -static hidl java"
Colin Cross [Fri, 4 Aug 2017 15:54:24 +0000 (15:54 +0000)]
Merge "Move inserted method after end of try block"
Hugo Benichi [Fri, 4 Aug 2017 04:18:40 +0000 (13:18 +0900)]
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
Colin Cross [Thu, 3 Aug 2017 22:58:45 +0000 (15:58 -0700)]
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
Calin Juravle [Sat, 22 Jul 2017 19:33:41 +0000 (12:33 -0700)]
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
Steven Moreland [Tue, 1 Aug 2017 23:34:40 +0000 (16:34 -0700)]
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
Jeff Hao [Mon, 31 Jul 2017 20:35:01 +0000 (13:35 -0700)]
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
Treehugger Robot [Thu, 3 Aug 2017 10:29:55 +0000 (10:29 +0000)]
Merge "Notify the user and turn off tethering when the service is disallowed."
Przemyslaw Szczepaniak [Thu, 3 Aug 2017 10:15:24 +0000 (10:15 +0000)]
Merge "Revert "Revert "Default 'persist.sys.timezone' property to GMT if not set on init."""
Treehugger Robot [Wed, 2 Aug 2017 23:25:32 +0000 (23:25 +0000)]
Merge "Fix compile issue"
Treehugger Robot [Wed, 2 Aug 2017 23:02:04 +0000 (23:02 +0000)]
Merge "com.android.server: use proper nativehelper headers"
John Reck [Wed, 29 Jun 2016 22:11:23 +0000 (15:11 -0700)]
Fix compile issue
Change-Id: Ic3423cfb23c6057210efb2e9110551b694c0101c
(cherry picked from commit
9688a3d33451134d6ff54f7b60f8db7a338a40f1)
Treehugger Robot [Wed, 2 Aug 2017 21:50:44 +0000 (21:50 +0000)]
Merge "zygote: always log process exit reason."
Steven Moreland [Tue, 1 Aug 2017 17:18:40 +0000 (10:18 -0700)]
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
Josh Gao [Wed, 2 Aug 2017 19:54:05 +0000 (12:54 -0700)]
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
Treehugger Robot [Wed, 2 Aug 2017 17:10:11 +0000 (17:10 +0000)]
Merge "Add owners for the network security config"
Treehugger Robot [Wed, 2 Aug 2017 16:46:42 +0000 (16:46 +0000)]
Merge "Add hwbinder library"
Treehugger Robot [Wed, 2 Aug 2017 16:29:23 +0000 (16:29 +0000)]
Merge "Delete dead code function SpotShadow::makeClockwise"
Jonathan Basseri [Wed, 2 Aug 2017 01:44:09 +0000 (01:44 +0000)]
Merge "Revert "Move getNetworkCountryIso impl from TM to PIM.""
Jonathan Basseri [Wed, 2 Aug 2017 01:10:47 +0000 (01:10 +0000)]
Revert "Move getNetworkCountryIso impl from TM to PIM."
This reverts commit
6f4657363cac93ddcc718d9716e3b138f770f2e2.
Change-Id: Ie0062369198af03441c531cd2181ed9c12b8f012
Stan Iliev [Wed, 27 Jul 2016 22:08:06 +0000 (18:08 -0400)]
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)
Chad Brubaker [Tue, 1 Aug 2017 20:03:06 +0000 (13:03 -0700)]
Add owners for the network security config
Test: build/make/tools/checkowners.py -c -v OWNERS
Change-Id: I9bb8f5ceaae4a1af8c93f5416a6a5cea42915c62
Jonathan Basseri [Tue, 1 Aug 2017 22:25:28 +0000 (22:25 +0000)]
Merge "Move getNetworkCountryIso impl from TM to PIM."
Jonathan Basseri [Wed, 19 Jul 2017 20:44:31 +0000 (13:44 -0700)]
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
Ruchi Kandoi [Tue, 1 Aug 2017 20:30:50 +0000 (20:30 +0000)]
Merge "Set default value for T3T_PMM."
Love Khanna [Tue, 1 Aug 2017 13:02:59 +0000 (18:32 +0530)]
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
Przemyslaw Szczepaniak [Fri, 28 Jul 2017 13:21:48 +0000 (13:21 +0000)]
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
Sundong Ahn [Thu, 13 Jul 2017 07:34:01 +0000 (16:34 +0900)]
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
Neil Fuller [Mon, 31 Jul 2017 12:51:05 +0000 (12:51 +0000)]
Merge "Remove redundant TODOs from PackageTracker"
Treehugger Robot [Mon, 31 Jul 2017 01:38:29 +0000 (01:38 +0000)]
Merge "Logging improvements when NetworkCapabilities change"
Hugo Benichi [Tue, 25 Jul 2017 02:40:56 +0000 (11:40 +0900)]
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
Neil Fuller [Fri, 28 Jul 2017 16:33:19 +0000 (17:33 +0100)]
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
Treehugger Robot [Fri, 28 Jul 2017 02:31:52 +0000 (02:31 +0000)]
Merge "Un-hide the MBMS streaming APIs"
Hall Liu [Tue, 18 Jul 2017 18:30:27 +0000 (11:30 -0700)]
Un-hide the MBMS streaming APIs
Unhides the MBMS streaming APIs and modifies the vendor base classes to
no longer pass raw AIDLs to the vendor code.
Test: builds
Change-Id: I56030d646c2a1160277d85779c6ed431cda4efa7
Treehugger Robot [Thu, 27 Jul 2017 17:00:13 +0000 (17:00 +0000)]
Merge "ActivityManagerService: fix nativehelper includes"
Neil Fuller [Thu, 27 Jul 2017 16:48:58 +0000 (16:48 +0000)]
Merge "Tidy up RulesManagerService code"
Steven Moreland [Wed, 26 Jul 2017 19:21:58 +0000 (12:21 -0700)]
ActivityManagerService: fix nativehelper includes
Bug:
63762847
Test: none
Merged-In: I9f9497990fbf0697d05445f563ad46a28d6d6eeb
Change-Id: I964c88cb74f0287dfc6634fbfcd3210a7d984213
Treehugger Robot [Thu, 27 Jul 2017 14:36:47 +0000 (14:36 +0000)]
Merge "NetworkNotificationManager: correctly handle existing notifications"
Hampus Wessman [Mon, 15 Apr 2013 10:26:51 +0000 (12:26 +0200)]
Fix graphical artifact in the fisheye effect
The fisheye effect generates a graphical artifact close to the center of
the picture, due to bad precision and division by zero in the shader.
The problem is fixed by making a small change in the shader, so that the
picture is uniformly scaled close to the center instead. This avoids the
problem and looks as expected, without affecting the performance.
Bug:
64107054
Test: Manual - Install dev sample HelloEffects and use the 'fisheye'
from the overflow. There is a small artifact in the center of the puppy
without this patch applied. Think of the puppies!!
Change-Id: I063f60facd30708db29ff544fdb47ac896e3d54b
Treehugger Robot [Thu, 27 Jul 2017 13:25:49 +0000 (13:25 +0000)]
Merge "Alter condition for starting RulesManagerService"
Treehugger Robot [Thu, 27 Jul 2017 13:01:05 +0000 (13:01 +0000)]
Merge "Revert "Default 'persist.sys.timezone' property to GMT if not set on init.""
Hugo Benichi [Tue, 25 Jul 2017 12:57:51 +0000 (21:57 +0900)]
NetworkNotificationManager: correctly handle existing notifications
This patch corrects a regression added by commit
fb2609d3eee1 that did
not take into account the case of multiple notifications shown for a
single network id. Given how network notifications are triggered, it can
happen that NO_INTERNET and SIGN_IN notifications are both triggered for
the same network when captive portal detection is slow.
Contrary to the situation before commit
fb2609d3eee1, a notification
priority order is introduced so that SIGN_IN always overrides
NO_INTERNET, and NO_INTERNET is ignored if SIGN_IN is already present.
Bug:
63676954
Bug:
62503737
Test: runtest frameworks-net, added new unit tests
Change-Id: Ib8658601e8d4dc6c41b335ab7dd8caa0cccd9531
Narayan Kamath [Thu, 27 Jul 2017 11:26:10 +0000 (11:26 +0000)]
Merge "Remove CoreTests: HeapTest"
Przemyslaw Szczepaniak [Wed, 26 Jul 2017 12:12:43 +0000 (12:12 +0000)]
Revert "Default 'persist.sys.timezone' property to GMT if not set on init."
Telephony code depends on persist.sys.timezone not being set as a signal
to deduce a timezone from sim card information.
This reverts commit
20e020536ebf999c4acb759960ae6e4bfff6ba67.
Bug:
64056758
Change-Id: I8db204bcffbdb960124b1ae0e02d53b27dd310a4
Takashi Furukawa [Wed, 12 Jul 2017 07:32:01 +0000 (16:32 +0900)]
Add null check for Wi-Fi command
When WifiService is not ready during boot phase and Wi-Fi command
is executed on console, NullPointerException happens.
To prevent this, null check is needed.
Test: Manual test
Bug:
64040515
Change-Id: I5684cdc7661b7d93fd6f2ac61863919077d12935
Neil Fuller [Wed, 26 Jul 2017 12:56:25 +0000 (13:56 +0100)]
Tidy up RulesManagerService code
1) Remove error handling TODO; no obvious issues.
2) Avoid avoid a NullPointerException in dumpsys code when current
state cannot be read.
3) Remove unnecessary public modifier.
Bug:
31008728
Test: make
Change-Id: Iab5fae74b74f54bf9d19410f0f4c9ed94365a162
Lucas Gomez Jimenez [Tue, 25 Jul 2017 13:11:35 +0000 (15:11 +0200)]
Remove CoreTests: HeapTest
It is largely redundant due to other tests in art/ and libcore/
Test: Run CoreTests
Change-Id: I97485c522fed157d650b95225ad6641e4184d7bf
Neil Fuller [Wed, 26 Jul 2017 11:11:58 +0000 (12:11 +0100)]
Alter condition for starting RulesManagerService
Modify the condition used for starting RulesManagerService:
use mOnlyCore rather than disableNonCoreServices. mOnlyCore is
important for the secure lock screen and when mOnlyCore is true
the RulesManagerService cannot perform trust checks. Therefore,
disable the RulesManagerService when mOnlyCore == true.
disableNonCoreServices is apparently not used.
Bug:
64057583
Test: Boot device with time zone updates enabled and with a lock
pattern set.
Merged-In: Idd7cb6e11b1a91dfe7394f6c98f8fa3e0eec9dce
Change-Id: Idd7cb6e11b1a91dfe7394f6c98f8fa3e0eec9dce
Treehugger Robot [Wed, 26 Jul 2017 00:12:51 +0000 (00:12 +0000)]
Merge "Silence a memory leak warning from the static analyzer"
George Burgess IV [Tue, 25 Jul 2017 21:22:07 +0000 (14:22 -0700)]
Silence a memory leak warning from the static analyzer
The analyzer assumes that the given `put` operation may fail. This
shouldn't be the case, so mark it with a LOG_ALWAYS_FATAL_IF. Doing so
silences a warning about potential memory leaks originating from
TessellationCache::getRoundRect.
Bug:
27101951
Test: mma. Warning is gone.
Change-Id: I3adeacd6c2c9c03caecd989e2a1267c51e8ef905
Treehugger Robot [Tue, 25 Jul 2017 16:12:23 +0000 (16:12 +0000)]
Merge "Adding 4 standard short codes required by Android Constellation"
Treehugger Robot [Tue, 25 Jul 2017 14:42:40 +0000 (14:42 +0000)]
Merge "Remove TODO related to WakeLocks"
Treehugger Robot [Tue, 25 Jul 2017 13:05:47 +0000 (13:05 +0000)]
Merge "Bootstrap IpReachabilityMonitor unit tests"
Neil Fuller [Tue, 25 Jul 2017 12:14:32 +0000 (13:14 +0100)]
Remove TODO related to WakeLocks
There's no need to keep a WakeLock in the RulesManager - if
the device goes to sleep it should continue the work when
it wakes up again. All I/O is handled via AtomicFile and should
be robust to corruption, etc. and this reduces the likelihood
of issues caused by sudden sleeps.
Bug:
31008728
Test: make
Change-Id: I3d5076ca7d2f39076f76bdb745cedde214eac21b
Hugo Benichi [Mon, 24 Jul 2017 00:30:52 +0000 (09:30 +0900)]
Bootstrap IpReachabilityMonitor unit tests
Bug:
62918393
Test: runtest frameworks-net
Change-Id: I236029f460dc3631ef9f5d8312dc1c6faf9807df
Treehugger Robot [Tue, 25 Jul 2017 02:38:47 +0000 (02:38 +0000)]
Merge "Add dump info to IpSecService"
Treehugger Robot [Tue, 25 Jul 2017 00:06:02 +0000 (00:06 +0000)]
Merge "Zygote: Increase wrap-pid timeout to thirty seconds"
ludi [Mon, 22 May 2017 17:52:23 +0000 (10:52 -0700)]
Add dump info to IpSecService
Bug:
38350824
Test: runtest frameworks-net
Change-Id: Ifa11d55e9d337016ad865baada627db3aa8c2db3
Shubham Ajmera [Mon, 24 Jul 2017 19:11:29 +0000 (19:11 +0000)]
Merge "Update DexFile#getDexOptNeeded usages to reflect API change"
Carlos Vinueza [Thu, 20 Jul 2017 23:40:35 +0000 (16:40 -0700)]
Adding 4 standard short codes required by Android Constellation
This set is last minute addition to the whitelist free short code batch
2017 Q2 - Android Partner Engineering
Includes 4 country wide SMS standard short codes required by the
Constellation team.
Test: manual - uploaded modified file onto test device and tested
sending SMS to changed shortcodes to verify behaviour.
Bug:
37355429
Change-Id: Iffad649a74dcc7afd6a3574a92825d309df2d3ba
Signed-off-by: Carlos Vinueza <chinesco@google.com>
Andreas Gampe [Fri, 21 Jul 2017 18:41:00 +0000 (11:41 -0700)]
Zygote: Increase wrap-pid timeout to thirty seconds
Some lowend devices under heavy instrumentation may not be able to
send the pid in the current five seconds. Drop the safety and
ignore watchdog debug builds, and move the timeout to thirty seconds.
Make the ZygoteConnection constants sharable in their own @hide class.
Add an assert into the watchdog that the wait time is less than the
watchdog time on non-debug builds.
Bug:
63904739
Bug:
63638768
Test: m
Test: manual test
Test: cts-tradefed run commandAndExit cts-dev -m CtsWrapWrapDebugTestCases
Change-Id: I80abdda54cd94e935de5a52b9f3c9192d0e31060
Treehugger Robot [Mon, 24 Jul 2017 11:21:21 +0000 (11:21 +0000)]
Merge "CaptivePortalLoginActivity: improve logging"
Treehugger Robot [Fri, 21 Jul 2017 23:18:09 +0000 (23:18 +0000)]
Merge "Revert "Revert "Update for less arguments in hidl toBinder."""
Shubham Ajmera [Wed, 19 Jul 2017 00:12:21 +0000 (17:12 -0700)]
Update DexFile#getDexOptNeeded usages to reflect API change
Test: make and boot
Merged-in: I68f9f617d6722a7ba8b00aa2181cb38a165cfc51
Bug:
36598475
(partially cherry-picked from commit
246dccf9327631597767afe418ce43ae6d07d102)
Change-Id: If90690d6234dc8727df2b2fb485f0c8d50970a92
Steven Moreland [Fri, 21 Jul 2017 19:29:54 +0000 (19:29 +0000)]
Revert "Revert "Update for less arguments in hidl toBinder.""
This reverts commit
243bcfda3ac35735a959f8abcc45186aba0af116.
(originally reverted due to merge conflicts)
Bug:
32172906
Test: hidl_test
Change-Id: I70fde3ffe0d2c67390f7152acedd45c39009a134
Hall Liu [Fri, 21 Jul 2017 21:09:34 +0000 (21:09 +0000)]
Merge "Make slight API and doc adjustments"
Steven Moreland [Fri, 21 Jul 2017 19:14:24 +0000 (19:14 +0000)]
Merge "Revert "Update for less arguments in hidl toBinder.""
Steven Moreland [Fri, 21 Jul 2017 19:13:05 +0000 (19:13 +0000)]
Revert "Update for less arguments in hidl toBinder."
This reverts commit
de2a9dfe3a7f343d4c1568d644ae0ddce7725a8d.
Change-Id: I6f451b0a05759501f59921747d95c6ae5b7ce656
Treehugger Robot [Fri, 21 Jul 2017 17:49:39 +0000 (17:49 +0000)]
Merge "Update for less arguments in hidl toBinder."
Treehugger Robot [Fri, 21 Jul 2017 17:38:53 +0000 (17:38 +0000)]
Merge "NFC DTA Integration"
Love Khanna [Wed, 17 May 2017 10:22:16 +0000 (15:52 +0530)]
NFC DTA Integration
Test: compiles.
Merged-In: I07cbb321ffbdbe9d93d632c8a56f3bc53218e592
Change-Id: I07cbb321ffbdbe9d93d632c8a56f3bc53218e592
Steven Moreland [Thu, 20 Jul 2017 16:24:56 +0000 (09:24 -0700)]
Update for less arguments in hidl toBinder.
Removed unnecessary templatization argument.
Test: hidl_test_java
Bug:
32172906
Change-Id: I88cd2bf7abc3065ece4e28698ba5e0d836b1d0e3
Treehugger Robot [Fri, 21 Jul 2017 08:07:40 +0000 (08:07 +0000)]
Merge "IpManagerTest: fix flaky test for real"
Hugo Benichi [Fri, 21 Jul 2017 05:12:26 +0000 (14:12 +0900)]
IpManagerTest: fix flaky test for real
Commit
c10fe5f46367 tried to fix the flaky unit test for a default
ProvisioningConfiguration but failed to reinitialize the mock class
involved, so that in practice the flaky assertion is as flaky as before.
This patch correctly resets the mock after the default assertions are
done once an IpManager object is created.
Bug:
32561414
Bug:
62918393
Test: runtest frameworks-net
Change-Id: I516b6981f96e83a90cb372a727c41f0b2ea59801
Hall Liu [Fri, 14 Jul 2017 20:39:54 +0000 (13:39 -0700)]
Make slight API and doc adjustments
* Fix a compile error on Java 7
* Update initialization mechanism to allow exceptions and return codes
* App-facing api for StreamingService#dispose no longer throws an
IllegalArgumentException
* Add REASON_NONE to stream state change reasons
Change-Id: I4710c6e56b35f74188f5877f0cf74b7773c1e9b7
Neil Fuller [Thu, 20 Jul 2017 17:58:12 +0000 (17:58 +0000)]
Merge "Logging improvements for time zone updates"
Neil Fuller [Thu, 20 Jul 2017 10:00:35 +0000 (11:00 +0100)]
Logging improvements for time zone updates
Logging improvements for time zone updates:
1) Add EventLog entries time zone update service interactions.
2) Add more information to dumpsys logs to improve debugging.
Unit tests run with:
make -j30 FrameworksServicesTests
adb install -r -g \
"out/target/product/angler/data/app/FrameworksServicesTests/FrameworksServicesTests.apk"
adb shell am instrument -e package com.android.server.timezone -w \
com.android.frameworks.servicestests \
"com.android.frameworks.servicestests/android.support.test.runner.AndroidJUnitRunner"
Bug:
31008728
Test: See above for unit testing.
Test: Internal xTS tests
Test: adb shell dumpsys timezone
Test: adb logcat -b events -v threadtime -v printable -v uid -d *:v
Change-Id: I9356f4694e60b49e4b06aadd632d1bad517b8a29