OSDN Git Service
xutianguo [Wed, 22 Jun 2016 03:32:00 +0000 (11:32 +0800)]
CachedBluetoothDevice: Simplify ProfleConnectionState check
Check whether ProfileConnectionState is empty instead of checking
whether it is null.
BUG: N/A
Change-Id: I553e7b8b0c1b3ae967dcc0ecd482b7ff19f3c1f6
Signed-off-by: xutianguo <xutianguo@xiaomi.com>
Treehugger Robot [Fri, 8 Sep 2017 04:13:14 +0000 (04:13 +0000)]
Merge "Support NAT keepalives"
Erik Kline [Mon, 19 Jun 2017 02:33:59 +0000 (11:33 +0900)]
Support NAT keepalives
Test: as follows
- built
- flashed
- booted
- "runtest frameworks-net" passes
- turned on debugging and walked around watching IpReachabilityMonitor
force neighbors into NUD_PROBE state without error
- observed NAT callbacks happening without any reported errors
- watched:
adb shell cat /proc/net/nf_conntrack | egrep '192[.]168[.]43[.]' | sort -n -k5
for correct timeout updates
Bug:
29337859
Bug:
32163131
Merged-In: I82ac60e5ad79ec64a13df6ec56b5b51b223f8dde
Merged-In: I09bc685e821ec5e871576a54c4290edea4c5160b
Merged-In: I4d180369a8f64ee494b016656988252d98a09ba4
Change-Id: Icb23da64cfaa3a19f7bc75fba426a52b0994fb0f
(cherry picked from commit
7a65bc62fbe0391f88834ab27b32033d6b957c8b)
Hugo Benichi [Fri, 8 Sep 2017 01:25:30 +0000 (01:25 +0000)]
Merge changes Ic92b6d5c,I98b23b22,I0fb40d7b
* changes:
IP metrics: update link layer mapping
IP connectivity metrics: fix tests after proto update
Connectivity metrics: update ipconnectivity.proto
Chen Xu [Thu, 7 Sep 2017 20:59:03 +0000 (20:59 +0000)]
Merge "Fix Crash CarrierDefaultApp due to exception"
Chen Xu [Thu, 7 Sep 2017 20:46:50 +0000 (20:46 +0000)]
Merge "fix cellular captive portal reevaluation url"
fionaxu [Mon, 10 Jul 2017 16:34:07 +0000 (09:34 -0700)]
fix cellular captive portal reevaluation url
we apply redirection link as the url everywhere for cellular captive portal.
this url should only be used when load the portal page at the first place (when users
click on the notification) and shouldn't be used as the re-evaluation url
as it wont return the expected response code.
instead we should use special URL (generate_204) from connectivity
service which will return 204 if redirection is gone.
Test: manual test with cold and hot TMO SIM
Bug:
62532802
Change-Id: I56bb03a58447c5c46758e692ff357d540ea4cd7b
Hugo Benichi [Tue, 18 Jul 2017 02:35:18 +0000 (11:35 +0900)]
IP metrics: update link layer mapping
Properly map transport nan and lowpan to their corresponding link layer
enum. Also do so for interface names
Bug:
34901696
Bug:
65439160
Test: runtest frameworks-net
Merged-In: I44a1cb3b6d21881b64adda7744360e4dfc519b12
(cherry picked from commit
f7f7ed013ca7641c784b81ef685bd84c4c45cfbb)
Change-Id: Ic92b6d5c07404ea79f9a8975e8fc6925eaa10ba4
Hugo Benichi [Tue, 18 Jul 2017 05:28:27 +0000 (14:28 +0900)]
IP connectivity metrics: fix tests after proto update
Update to ipconnectivity.proto in commit
6d2f506bfd788a3685292d404dc9d82a27357cfe broke the associated unit
tests (Change-Id: I4cf5b95956df721aecd63fddfb026a7266c190b9)
Bug:
34901696
Bug:
65439160
Test: runtest frameworks-net
Merged-In: I57a6bad8a9836b1c45690c4589b416786ce1dfa0
(cherry picked from commit
822c5bf77892175d0b52aeaddf4e43c749c341f6)
Change-Id: I98b23b2208bbd7d12237fcb000f3cf10c53d9e55
Hugo Benichi [Tue, 20 Jun 2017 02:15:14 +0000 (11:15 +0900)]
Connectivity metrics: update ipconnectivity.proto
Bug:
34901696
Bug:
65439160
Test: $runtest frameworks-net
build, flashed, booted phone, $ adb shell dumpsys connmetrics list
Merged-In: I4cf5b95956df721aecd63fddfb026a7266c190b9
(cherry picked from commit
6d2f506bfd788a3685292d404dc9d82a27357cfe)
Change-Id: I0fb40d7b644786efc839468b2d7e1cfcedd71ad8
Rubin Xu [Thu, 7 Sep 2017 12:12:09 +0000 (12:12 +0000)]
Merge "Always add local subnet routes to the interface's routing table"
Rubin Xu [Tue, 5 Sep 2017 17:40:49 +0000 (18:40 +0100)]
Always add local subnet routes to the interface's routing table
For some networks such as mobile data connections, its LinkProperties
does not contain routes for the local subnet so no such route is added
to the interface's routing table. This can be problematic especially
if the device is in VPN lockdown mode where there exists high-priority
PROHIBIT routing rule which in turn blocks the network's default gateway
route from being added (next hop address hitting the prohibit rule).
We fix this by patching LinkProperties to always include direct connected routes
when they are received by ConnectivityService. This has the added advantage that
when apps get LinkProperties, they see the directly connected routes as well.
Bug:
63662962
Test: runtest frameworks-core -c android.net.LinkPropertiesTest
Test: runtest frameworks-services -c com.android.server.ConnectivityServiceTest
Test: Start with device with mobile data, set up ics-OpenVPN in always-on
lockdown mode. Turn off mobile data then turn it back on, observe
mobile data connectivity is restored and VPN successfully reconnects.
Change-Id: I35b614eebccfd22c4a5270f40256f9be1e25abfb
Qiongcheng Luo [Fri, 4 Aug 2017 06:34:34 +0000 (14:34 +0800)]
Fix Crash CarrierDefaultApp due to exception
[Issue]
CarrierDefaultApp crashes due to null pointer exception.
[Cause of defect]
To call mUrl.toString() even if mUrl is null and mUrl is already
checked if it is null just before.
[How to fix]
Check the null status of mUrl when call its toString() method.
Bug:
65393337
Change-Id: I4b4b1f125aac7e30ca18be22d7adc358cab83b2f
Treehugger Robot [Wed, 6 Sep 2017 23:53:48 +0000 (23:53 +0000)]
Merge "disable carrier actions on redirection by default"
fionaxu [Wed, 6 Sep 2017 21:19:16 +0000 (14:19 -0700)]
disable carrier actions on redirection by default
1. the assumption of "carrier will redirect users to their captive
portal page when users dont have data plan" might not be true for all
carriers. We have seem issues like carriers random redirect users when
they still have balance left.
2. turn this off by default and turn it on if the carrier is
behaving correctly and agree with it.
Merged-in: I6bc2d8ba45958eaf09e09e3ea2e57c79e0ac461e
Bug:
65113738
Test: Manual
Change-Id: I60be2de3aa227298e60ea7eb9535bad8967b1fe3
Adam Lesinski [Wed, 6 Sep 2017 19:44:26 +0000 (19:44 +0000)]
Merge "idmap: include idmap version in check for stale file"
Treehugger Robot [Wed, 6 Sep 2017 19:41:01 +0000 (19:41 +0000)]
Merge "idmap: suppress print for padded resources"
Colin Cross [Wed, 6 Sep 2017 18:34:47 +0000 (18:34 +0000)]
Merge "Fix intermittent build failures with droiddoc generated sources"
Colin Cross [Wed, 6 Sep 2017 05:59:27 +0000 (22:59 -0700)]
Fix intermittent build failures with droiddoc generated sources
Jack builds fail very rarely with missing droiddoc generated
source files. This happens because jack builds have an extra
rule that does a quick check of the sources and touches a
jack.check.timestamp file. The manual dependencies for the
generated sources didn't cover this case. If the sources are
partially generated when the jack.check.timestamp rule runs,
the rule can see partial sources and fail. The same problem
might also happen for javac builds after
https://android-review.googlesource.com/c/platform/build/+/404743
separated the source list generation rule out of the
$(full_classes_jar) rule.
Use LOCAL_ADDITIONAL_DEPENDENCIES instead, which covers these
cases and will be updated to cover future changes.
Bug:
65255877
Test: m -j ANDROID_COMPILE_WITH_JACK=true out/target/common/obj/JAVA_LIBRARIES/android.test.runner.stubs_intermediates/jack.check.timestamp
make sure sources are generated
Change-Id: I4466b3128eb0bba6447c24abf921a6655a3d451f
Merged-In: I4466b3128eb0bba6447c24abf921a6655a3d451f
(cherry picked from commit
85ab406eb2abd2e98fa9a67384223592692c08a9)
Treehugger Robot [Wed, 6 Sep 2017 15:53:00 +0000 (15:53 +0000)]
Merge "Separate GraphicsEnv from libui"
Treehugger Robot [Wed, 6 Sep 2017 15:10:18 +0000 (15:10 +0000)]
Merge "Fix NPE in StatusBar#onBackPressed()"
Kensuke Matsui [Fri, 21 Jul 2017 08:35:10 +0000 (17:35 +0900)]
Fix NPE in StatusBar#onBackPressed()
StatusBar.mKeyguardUserSwitcher is instantiated
only if multi user function is enabled.
But mKeyguardUserSwitcher.hideIfNotSimple() is invoked
without null check in StatusBar#onBackPressed().
This causes NPE on multi user disabled devices.
Fixes:
65391930
Test: manual - tap Back key on lockscreen
Change-Id: I528823fa832ee5096d73dea660997fc276d86c5c
Treehugger Robot [Wed, 6 Sep 2017 00:10:55 +0000 (00:10 +0000)]
Merge "Bluetooth: Thread-safe binder invocation"
Jack He [Thu, 17 Aug 2017 19:11:18 +0000 (12:11 -0700)]
Bluetooth: Thread-safe binder invocation
* Binder object may become null between null check and actual invocation
if using a instance private variable assignable by service connection
callbacks
* The solution to this problem without locking is to assign existing
binder variable to a local final variable before the null check
* Any further invocation to a disconnected binder object will result in
RemoteException that is caught by the try-catch block
* Read and write to volatile variable is always atomic and hence thread-safe
* Removed unnecessary synchronization in BluetoothAdapter constructor
* Private mConnection objects should be final
* Simplfied several return statements where booleans can be returned
directly
* Removed unnecessary catches for NPE since there won't be any
Bug:
64724692
Test: make, pair and use devices, no functional change
Change-Id: Ifc9d6337c0d451a01484b61243230725d5314f8e
Treehugger Robot [Tue, 5 Sep 2017 23:50:24 +0000 (23:50 +0000)]
Merge "Update documentation for startScan"
Jiyong Park [Mon, 8 May 2017 04:29:35 +0000 (13:29 +0900)]
Separate GraphicsEnv from libui
GraphicsEnv class is separated from libui and became a standalone lib
'libgraphicsenv'.
Bug:
38097618
Test: sailfish builds and boots
Change-Id: I7a5c273ba9238c3a6c90e1de80b9e97fc0772188
Yifan Hong [Tue, 5 Sep 2017 21:45:13 +0000 (21:45 +0000)]
Merge "Fix ownership of objects returned by VintfObject::Get*"
Vinay Kalia [Fri, 1 Sep 2017 19:18:10 +0000 (12:18 -0700)]
Update documentation for startScan
With change c4a1e1, unfiltered BLE scans are stopped on screen off
and resumed when screen is turned back on. This is done to save power.
This change updates the documentation accordingly.
BUG:
62264269
Test: Documentation update.
Change-Id: I2d8e9f9f122f978c4d4f59d4139cb51cd4e4a123
Treehugger Robot [Tue, 5 Sep 2017 13:46:53 +0000 (13:46 +0000)]
Merge "ConnectivityService: improve wakelock logging"
Hugo Benichi [Tue, 5 Sep 2017 04:25:07 +0000 (13:25 +0900)]
ConnectivityService: improve wakelock logging
This patch adds the following wakelock related counters to connectivity
service dumps included in bug reports:
- total number of wakelok acquisitions and releases
- total cumulative wakelock duration
- longest time the lock was held
Bug:
65085354
Test: runtest frameworks-net, also manually dumped connectivity service
and check new logging
Merged-In: I8f67750c2eea73abf3d44f7f6df484427a8ea3f9
Merged-In: I93c0eb7c8add966378647400e11e33765d952345
Merged-In: Iabe99993001e069b8a8077533bca1fa7fb2f59ba
(cherry picked from commit
26bcfa19d01758c86a8f43a5b39673cd5866d2f3)
Change-Id: I4d6bb43110916b440819813b478523546ac5570e
Hugo Benichi [Tue, 5 Sep 2017 12:12:02 +0000 (12:12 +0000)]
Merge "Nat464Xlat: correct racefree teardown"
Treehugger Robot [Tue, 5 Sep 2017 09:17:46 +0000 (09:17 +0000)]
Merge "Switch tethering stats from the unix socket to binder."
Hugo Benichi [Fri, 1 Sep 2017 01:23:32 +0000 (01:23 +0000)]
Nat464Xlat: correct racefree teardown
This patch relays the NetworkBaseObserver notifications about nat
464xlat stacked interfaces onto the ConnectivityService handler.
This allows to process interface up and down notifications in the
same thread context and eliminates several races:
- NPE risk due to race between fixupLinkProperties called on
ConnectivityService thread and interfaceRemoved called on
NetworkManagementService thread.
- stale LinkProperties pointer reads in both NetworkBaseObserver
callbacks not called on ConnectivityService handler.
- removes the race between stop() and interfaceRemoved().
- removes superfluous LinkProperties notifications when stop() is
called before the stacked interface goes up.
The teardown procedure logic common to stop() and interfaceRemoved() is
put into enterStoppedState() and enterIdleState().
This allows to distinguish and correctly handle the following teardown
scenarios:
- an IPv4 appears -> ConnectivityService calls Nat464Xlat#stop()
-> Nat464Xlat calls stopClatd
-> clatd stops
-> if the stacked interface was up, it is removed
-> Nat464Xlat#interfaceRemoved() is triggered and
a LinkProperties update is sent.
- network disconnects -> ConnectivityService calls Nat464Xlat#stop()
-> Nat464Xlat calls stopClatd
-> clatd stops
-> if the stacked interface was up, it is removed
-> Nat464Xlat#interfaceRemoved() is triggered and
a LinkProperties update is sent.
- clatd crashes or exit -> Nat464Xlat#interfaceRemoved() is triggered
-> Nat464Xlat unregisters itself as a network
observer
-> ConnectivityService is updated about the
stacked interface missing, and restarts
Nat464Xlat if needed.
Note that the first two scenarios have two cases: stop() can be called
before the notification for the stacked interface going up (STARTED), or
after (RUNNING). In the first case, Nat464Xlat must unregister
immediately as a network observer to avoid leaks.
This patch also:
- removes/simplifies comments related to the threading model which
are no obsolete.
- extract clatd management logic from ConnectivityService into
NetworkAgentInfo
- add new unit tests where there was none before.
Bug:
62918393
Bug:
62997041
Bug:
64571917
Bug:
65225023
Test: runtest frameworks-net
Change-Id: I27221a8a60fd9760b567ed322cc79228df877e56
Lorenzo Colitti [Fri, 1 Sep 2017 08:12:34 +0000 (17:12 +0900)]
Switch tethering stats from the unix socket to binder.
Bug:
32163131
Bug:
64995262
Test: builds
Change-Id: I673d76a8b0981302b5f6a14e97999cd7676d83ed
Treehugger Robot [Tue, 5 Sep 2017 01:14:17 +0000 (01:14 +0000)]
Merge "Refactor interface IP code into InterfaceController"
Hugo Benichi [Mon, 4 Sep 2017 11:50:58 +0000 (11:50 +0000)]
Merge "Network Service Discovery test: properly release resources"
Mårten Kongstad [Tue, 28 Mar 2017 13:30:21 +0000 (15:30 +0200)]
idmap: include idmap version in check for stale file
Teach is_idmap_stale_fd to include the idmap version in the list of
criteria used to determine if an idmap file is already up to date.
Change-Id: I3e4e2aa502fe76a034c3977bdb055a1df7e665be
Mårten Kongstad [Mon, 29 Feb 2016 13:12:35 +0000 (14:12 +0100)]
idmap: suppress print for padded resources
Bug:
31052947
Test: manual
Change-Id: I13723bf8b1cdeecfd71750123eb1f949f96b7c3e
Treehugger Robot [Mon, 4 Sep 2017 04:58:16 +0000 (04:58 +0000)]
Merge "Fix some broken tests in frameworks-net with native dependencies"
Treehugger Robot [Mon, 4 Sep 2017 03:39:59 +0000 (03:39 +0000)]
Merge "DO NOT MERGE: Fix ApfTest"
Treehugger Robot [Mon, 4 Sep 2017 02:11:47 +0000 (02:11 +0000)]
Merge "Record even more stats even more often"
Hugo Benichi [Fri, 4 Aug 2017 03:12:25 +0000 (12:12 +0900)]
Fix some broken tests in frameworks-net with native dependencies
Exempt-From-Owner-Approval: Android.mk uses per-file permission to let
the build team modify it without dependeing on us. However because this
rule overrides the directory default owners, Android core networking is
not owner anymore. This exemption is necessary to let Android core
networking team fix their build file.
Test: All tests in runtest frameworks-net pass.
Merged-In: Ie0b8baa38ca39e92fbd698ebcead86dac0a67708
(cherry picked from commit
99e8ab6e46eec5dbd1b059b3732672d537b3cf34)
Change-Id: I4471a5cd7f20852645f3d94684cc5aeef3324162
Hugo Benichi [Thu, 1 Jun 2017 06:54:59 +0000 (15:54 +0900)]
DO NOT MERGE: Fix ApfTest
libutils is now depending on libvndksupport. So any client that
statically links to libutils needs to link against libvndksupport as
well.
Bug:
32561414
Test: ApfTest works
Merged-In: Id99792baa1c0a7a61c4056f83f33d25e0bea143e
(cherry picked from commit
9a2041ee836be925e93dd820f11686aa378dd92d)
Change-Id: I8808e668230ff7076403ff29cf48c12cbc36f78a
Erik Kline [Thu, 31 Aug 2017 12:09:45 +0000 (21:09 +0900)]
Record even more stats even more often
Like kale, one can never have enough stats. =)
Test: as follows
- built
- flashed
- booted
- runtest frameworks-net passes
Bug:
29337859
Bug:
32163131
Merged-In: I5d40eae488cab685be6a44849181c0286fe28fdb
Merged-In: I759e97f9a72d15a84036c3a56451b872143539c6
Change-Id: Ieb47c3beed50f21c2c858fe57438afd48cfdc662
(cherry picked from commit
1199a352fcb938a8dc7a34a2853c4fde7f5656f1)
Erik Kline [Sun, 3 Sep 2017 11:38:29 +0000 (20:38 +0900)]
Refactor interface IP code into InterfaceController
Test: as follows
- built
- flashed
- booted
- runtest frameworks-net passes
(except for UidRange and APF tests that are missing libvndk)
- regular WiFi STA mode attach works for IPv4-only, dualstack,
and IPv6-only networks
- tethering works with dualstack upstream and downstream
Bug:
62476366
Change-Id: Id807b3091b0b2935b01aeb3644245034312b4183
Hugo Benichi [Mon, 31 Jul 2017 11:35:58 +0000 (20:35 +0900)]
Network Service Discovery test: properly release resources
Bug:
32561414
Bug:
62918393
Bug:
62044295
Test: runtest frameworks-net
Change-Id: If23993b5e391947ecbdc01677f0a643144794b2b
Brad Ebinger [Fri, 1 Sep 2017 21:06:55 +0000 (21:06 +0000)]
Merge "Adds ERROR state to ImsConfig"
Brad Ebinger [Fri, 1 Sep 2017 21:06:27 +0000 (21:06 +0000)]
Merge "Remove PIN/PUK keyguard when SIM is removed/ready"
Treehugger Robot [Fri, 1 Sep 2017 20:58:49 +0000 (20:58 +0000)]
Merge "Fixed default values for Bluetooth energy calculations"
Hansong Zhang [Fri, 18 Aug 2017 22:03:56 +0000 (15:03 -0700)]
Fixed default values for Bluetooth energy calculations
There are values used for Bluetooth energy calculations in the
configuration file. The values were set to 1, 2, 3, 4 and ends up giving
some very wrong energy calculations. They are now set to 0 by default.
Bug:
64662990
Test: manual
Change-Id: I2be2a19f50e2e56d7dadb9ff23b9827520d4d1ea
(cherry picked from commit
3e6eb50e35f4d0fb8db774bed17a46effbc65671)
Brad Ebinger [Fri, 25 Aug 2017 21:53:30 +0000 (14:53 -0700)]
Adds ERROR state to ImsConfig
Adds the ERROR return state for bool provisioning values
so that we can throw an Exception in some cases.
Bug:
64540800
Test: Manual
Merged-In: Id412c0be939da6240a66a942730fd18badabb6c6
Change-Id: I0b79837c694d245999031ec65783857e114b7c75
Treehugger Robot [Fri, 1 Sep 2017 17:11:26 +0000 (17:11 +0000)]
Merge "Fix typo in CarrierConfigManager javadoc."
Brad Ebinger [Mon, 21 Aug 2017 21:58:52 +0000 (14:58 -0700)]
Remove PIN/PUK keyguard when SIM is removed/ready
1) If the PIN/PUK keyguard comes up for a locked
SIM, it can not be removed by removing the
affected SIM. It can only be removed by
rebooting the device or entering a bogus PIN.
This change automatically clears the keyguard
when when the locked SIM is removed. It will
be shown again if the locked SIM is re-entered.
2) If the device is PUK locked and the code
**05*PUK*new pin* new Pin# is entered in the
emergency dialer, it will unlock the SIM.
By listening to the READY state, we can remove
the keyguard when the SIM is unlocked by
other means.
Bug:
64469515
Bug:
64044132
Test: Manual
Merged-In: I7b576ee7e38f141075cae094e3d1f74b7145d53f
Change-Id: I9507f80edcd4c04dfa0cc3b48a25e619aafa9eb3
Jason Monk [Fri, 1 Sep 2017 12:56:56 +0000 (12:56 +0000)]
Merge "Fix animation of settings button in RTL layout case"
Bin Chen [Fri, 1 Sep 2017 10:12:53 +0000 (18:12 +0800)]
Fix typo in CarrierConfigManager javadoc.
Change-Id: Ie9d2f7aa705b7895777dcfa27e6826babff64e29
Treehugger Robot [Fri, 1 Sep 2017 06:19:11 +0000 (06:19 +0000)]
Merge "Add APF black list for ether-type"
Ahmed ElArabawy [Wed, 2 Aug 2017 20:31:05 +0000 (13:31 -0700)]
Add APF black list for ether-type
Add a configurable black for protocols which packets are to be dropped
by APF. This enales an OEM to configure the APF to filter out un-needed
packets from reaching the host
Bug:
62415182
Test: runtest frameworks-net
Merged-In: I86335a0f854d5e83a2b2767978cd69b2cc25c2f8
Signed-off-by: Ahmed ElArabawy <arabawy@google.com>
(cherry picked from commit
caffbe127726c6a9ab5dd023a9b09cfa43eac617)
Change-Id: I15a758d18464d73d24ba8364a867904bb3cd3b34
Akira Oshimi [Thu, 3 Aug 2017 02:02:34 +0000 (11:02 +0900)]
Fix animation of settings button in RTL layout case
The settings button overlaps with the expand indicator
in RTL layout case when rotating the device to landscape mode.
To fix this issue, the animation of settings button
in RTL layout case should be changed.
Fixes:
65228478
Test: manual - set a BiDi language and open Notification panel.
Change-Id: I008b33ebcdf074639a291e7d30d3343654a2ea37
Treehugger Robot [Thu, 31 Aug 2017 21:31:31 +0000 (21:31 +0000)]
Merge "Remove unused methods from OMS"
Treehugger Robot [Thu, 31 Aug 2017 21:27:42 +0000 (21:27 +0000)]
Merge changes I7218f17a,I96b7340a
* changes:
ResourcesManager: correct @NonNull -> @Nullable
AAPT2: Allow <overlay> in AndroidManifest.xml
Treehugger Robot [Thu, 31 Aug 2017 20:51:38 +0000 (20:51 +0000)]
Merge "OMS: fix listener callbacks triggered by changes to target package"
lingjunl [Thu, 31 Aug 2017 19:46:39 +0000 (19:46 +0000)]
Merge "Whitelist free sms shortcode 76551 in Mexico for constlletion."
Treehugger Robot [Thu, 31 Aug 2017 16:43:44 +0000 (16:43 +0000)]
Merge "Test: Drag on the divider line."
Treehugger Robot [Thu, 31 Aug 2017 15:01:37 +0000 (15:01 +0000)]
Merge changes I49057737,I68e3096d
* changes:
Frameworks: Clean up SystemProperties
Frameworks: Add warning to SystemProperties.get
Hugo Benichi [Thu, 31 Aug 2017 14:31:24 +0000 (14:31 +0000)]
Merge "Revert "Nat464Xlat: interface notification handler on ConnectivityService""
Hugo Benichi [Thu, 31 Aug 2017 14:29:51 +0000 (14:29 +0000)]
Revert "Nat464Xlat: interface notification handler on ConnectivityService"
This reverts commit
771d5c2f0126ba692897c9716f4098ae6e3a870c due to b/
65225023.
Change-Id: I6ca3780afb8d47b77219d6b5a06760042f684c4b
Mårten Kongstad [Thu, 26 Jan 2017 08:54:21 +0000 (09:54 +0100)]
Remove unused methods from OMS
Remove the unused methods
- IdmapManager.isDangerous(PackageInfo, int)
- IdmapManager.isDangerous(String)
The concept of a dangerous overlay is currently not used, so remove any
trace of it.
Test: builds
Change-Id: I79ea00c05c0ee113733c20e982ae8f517bbbbd11
Mårten Kongstad [Fri, 28 Apr 2017 11:10:11 +0000 (13:10 +0200)]
ResourcesManager: correct @NonNull -> @Nullable
To clear all overlay packages, the caller of
ResourcesManager#applyNewResourceDirsLocked will pass in null as the
second argument. Fix typo where the argument's annotation misspelled
@Nullable as @NonNull.
Change-Id: I7218f17ac8f121924e722d3e00d3ebdc4d6f3382
Mårten Kongstad [Mon, 26 Jun 2017 13:26:32 +0000 (15:26 +0200)]
OMS: fix listener callbacks triggered by changes to target package
The OverlayManagerListener connected to the OverlayManagerServiceImpl
should be notified when and only when the overlay settings have been
modified. The pattern used to fulfill this contract as a result of a
change to a target package is as follows:
if (updateAllOverlaysForTarget(...)) {
mListener.onOverlaysChanged(...);
}
Fix two violations of this pattern:
- The listener was always notified
- The listener was never notified
Test: manual
Change-Id: Id24a439e2eaaf976e8c7d650af36d58632cfb4ba
Mårten Kongstad [Thu, 8 Dec 2016 23:23:41 +0000 (00:23 +0100)]
AAPT2: Allow <overlay> in AndroidManifest.xml
Test: libaapt2_tests
Test: manual (build an overlay package)
Change-Id: I96b7340a53a7d4f1ca022065674fbf5bdaa273f2
Treehugger Robot [Thu, 31 Aug 2017 03:11:51 +0000 (03:11 +0000)]
Merge "Shutdown more reliably"
Andreas Gampe [Sat, 29 Jul 2017 21:14:39 +0000 (14:14 -0700)]
Frameworks: Clean up SystemProperties
Clean up SystemProperties.java. Add annotations.
Clean up SystemProperties.cpp. Refactor for proper C++11.
Make sure C-string key construction is properly reused. Use
android::base functionality for actual reading.
Fix the test script to refer to the right location. Add some
test coverage.
(cherry picked from commit
2e6b9cb56320a86f0c33da890f667e5c76c8285d)
Test: m
Test: frameworks/base/core/tests/systemproperties/run_core_systemproperties_test.sh --rebuild
Merged-In: I490577370da985f600fb1117e3c818d3f68bad5f
Change-Id: I490577370da985f600fb1117e3c818d3f68bad5f
Andreas Gampe [Sat, 29 Jul 2017 01:20:37 +0000 (18:20 -0700)]
Frameworks: Add warning to SystemProperties.get
Add a warning that calling get() is unsafe when the system property
may not contain a valid UTF-encoded string.
(cherry picked from commit
6bf1cff1dd8cad0d2c6eb4f2cef28a97270e46b2)
Bug:
63177684
Test: m
Merged-In: I68e3096d770a32fe204be5c130a3ada9d3db7c0b
Change-Id: I68e3096d770a32fe204be5c130a3ada9d3db7c0b
Yifan Hong [Wed, 30 Aug 2017 17:20:02 +0000 (10:20 -0700)]
Fix ownership of objects returned by VintfObject::Get*
VintfObject::Get* returns a pointer that clients
can own.
Test: builds
Bug:
65166415
Change-Id: Ia3d3f5c00172dec462eb5e8ceeb7b0ba98bc6cfb
Treehugger Robot [Wed, 30 Aug 2017 20:40:54 +0000 (20:40 +0000)]
Merge "IllegalArgumentException in MagnificationGestureHandler"
Erik Kline [Wed, 30 Aug 2017 06:37:20 +0000 (15:37 +0900)]
Shutdown more reliably
Also: collapse largely unused VDBG/DBG into just DBG.
Test: as follows
- built
- flashed
- booted
- runtest framworks-net passes
Bug:
64914645
Change-Id: Ifbb6b1ce18c52c9cb58c89b9661248a155f7b4a8
Colin Cross [Wed, 30 Aug 2017 00:25:36 +0000 (00:25 +0000)]
Merge "Fix errorprone build"
Colin Cross [Tue, 29 Aug 2017 19:18:55 +0000 (12:18 -0700)]
Fix errorprone build
Fixes:
frameworks/base/tests/net/java/com/android/server/connectivity/tethering/OffloadControllerTest.java:149: error: [JUnit4TestNotRun] Test method will not be run; please add @Test annotation
public void testNoSettingsValueDefaultDisabledDoesNotStart() throws Exception {
^
(see http://errorprone.info/bugpattern/JUnit4TestNotRun)
Did you mean '@Test'?
frameworks/base/tests/net/java/com/android/server/connectivity/tethering/OffloadControllerTest.java:170: error: [JUnit4TestNotRun] Test method will not be run; please add @Test annotation
public void testNoSettingsValueDefaultEnabledDoesStart() throws Exception {
^
(see http://errorprone.info/bugpattern/JUnit4TestNotRun)
Did you mean '@Test'?
Bug:
64489631
Test: m -j RUN_ERROR_PRONE=true javac-check
Merged-In: Ib32489d07778465134bca52c589baddbd78ab129
Change-Id: I41dfdf87529e532df385617fa05c7006a7a14c86
Jason Monk [Tue, 29 Aug 2017 14:25:12 +0000 (14:25 +0000)]
Merge "Fix QS user icon in guest mode"
Joachim Sauer [Tue, 29 Aug 2017 13:42:26 +0000 (13:42 +0000)]
Merge "Adapt ICU 59 API update to Doclava changes."
Akari Tsuneta [Thu, 10 Aug 2017 11:51:44 +0000 (20:51 +0900)]
Fix QS user icon in guest mode
When the profile is updated in guest mode, the user icon in QS footer
is not displayed correctly. To fix this issue, the tinting of
guest icon is applied only when the drawable is not UserIconDrawable.
Fixes:
65148947
Test: manual - switch to guest and update the profile.
Change-Id: I9690e9fd286703a25ee08d877c3dd7f4729e2b31
Joachim Sauer [Tue, 29 Aug 2017 10:26:29 +0000 (11:26 +0100)]
Adapt ICU 59 API update to Doclava changes.
Add methods that were missing from the previous API update because the
update-api version used for that had different behaviour from the
current one.
Specifically overrides for methods that differ only in sychronization
are now considered API-worthy and weren't before (b/
62576297).
All methods added in this commit are methods that exist in the base
class without synchronization and are synchronized in the class they are
now being added in.
Bug:
64807220
Test: m checkapi
Change-Id: I9bf1b3d02e6a8f04b93ec36c0adffb7eedad3ad3
Merged-In: Iff584fb72dc8d651f9482b573f4b8cec89840ca6
Jakub Pawlowski [Tue, 29 Aug 2017 08:00:55 +0000 (08:00 +0000)]
Merge "Fix GATT client leakage when scan is throttled (1/2)"
Hugo Benichi [Tue, 29 Aug 2017 05:08:00 +0000 (05:08 +0000)]
Merge "Nat464Xlat: interface notification handler on ConnectivityService"
Hugo Benichi [Wed, 5 Jul 2017 02:08:48 +0000 (11:08 +0900)]
Nat464Xlat: interface notification handler on ConnectivityService
This patch adds a layer of asynchonicity to the NetworkBaseObserver
callbacks implemented by Nat464Xlat in order to allow these callbacks
to run on the main ConnectivityService handler.
This allows to run interfaceLinkStateChanged and interfaceRemoved
callbacks in the same thread context as other Nat464Xlat methods and
solves the following issues:
- NPE risk due to race between fixupLinkProperties called on the
ConnectivityService thread and interfaceRemoved called as a
callback by NetworkManagementService.
- stale LinkProperties reads in both callbacks not called on
ConnectivityService handler.
- removes the race between stop() and interfaceRemoved().
This patch also:
- removes/simplifies comments related to the threading
model which are no obsolete.
- extract clatd management logic from ConnectivityService into
NetworkAgentInfo
Bug:
62997041
Bug:
64571917
Test: runtest frameworks-net
manually connected to ipv6 network and went to test-ipv6.com
Change-Id: I889d98e47423ff3d4746d6ed8015b265286e7c52
Colin Cross [Mon, 28 Aug 2017 23:50:52 +0000 (23:50 +0000)]
Merge "Use guava 21.0"
Hugo Benichi [Mon, 28 Aug 2017 22:30:27 +0000 (22:30 +0000)]
Merge "Nat464Xlat: internal state guards cleanup + state enum"
Treehugger Robot [Mon, 28 Aug 2017 22:12:37 +0000 (22:12 +0000)]
Merge "Fixed mimetype error of PPT file"
bokyung.kim [Wed, 26 Jul 2017 01:18:39 +0000 (10:18 +0900)]
Fixed mimetype error of PPT file
Change mimetype of PPT file to match MS specification.
(MimeUtils.java matched the MS specification)
Test: Check mimetype of DB after saving PPT file.
Change-Id: Ie559499ae39bc527fcc656ba37f28845af209e6c
Signed-off-by: bokyung.kim <bokyung.kim@lge.com>
Treehugger Robot [Mon, 28 Aug 2017 19:42:11 +0000 (19:42 +0000)]
Merge "Ensure the generation is not changed before put value to cache"
Jakub Pawlowski [Mon, 28 Aug 2017 11:12:49 +0000 (04:12 -0700)]
Fix GATT client leakage when scan is throttled (1/2)
Currently, scan throttling happens after client is registered, but
before the scan is started. This might lead to scan client being leaked.
This patch fixed that by moving check before client registration.
Bug:
64887233
Test: manual
Change-Id: I22ae624a0c51110cb69679f796926e3b2b36d0ac
Edward Savage-Jones [Mon, 28 Aug 2017 08:44:18 +0000 (10:44 +0200)]
IllegalArgumentException in MagnificationGestureHandler
When enabling the magnifier feature it is possible to trigger
a system crash.
Problem:
On ACTION_DOWN a MESSAGE_ON_ACTION_TAP_AND_HOLD is sent to the
handler with a delay based on long-press timeout. If the user
then removes their finger while outside of the magnification area,
(ACTION_UP) this message is not removed. Then when the message
is handled on long-press timeout, it puts the state into
STATE_VIEWPORT_DRAGGING. If the user then taps the screen again
it is handled by the StateViewportDraggingHandler resulting in:
IllegalArgumentException: Unexpected event type: ACTION_DOWN
and a system server crash.
Bug:
65101895
Test: Manual:
1. Enable "Magnify with button" from accessibility settings
2. Tap accessibility button on the right navbar
3. Touch & hold bottom part of application area
4. Quickly drag down to the navbar and release
5. Touch anywhere
With this patch it should not crash
Change-Id: I7df8d2185f6db9d148d24d2b155cb357b3637a71
Treehugger Robot [Mon, 28 Aug 2017 12:39:29 +0000 (12:39 +0000)]
Merge "Trivial change to test expectations."
Hugo Benichi [Mon, 28 Aug 2017 11:47:08 +0000 (11:47 +0000)]
Merge "Nat464Xlat: clat management cleanup"
Lorenzo Colitti [Thu, 24 Aug 2017 03:40:07 +0000 (12:40 +0900)]
Trivial change to test expectations.
(cherry picked from commit
0fee732ca579bbc4320ade35f238bdfa1aa500f5)
Bug:
32163131
Test: runtest frameworks-net
Change-Id: Iec8af5191b4da495e47ef97d70a03a5d2e75cfe2
Lorenzo Colitti [Mon, 28 Aug 2017 08:02:19 +0000 (08:02 +0000)]
Merge "switch to native_handle_create() for passing ownership"
Hugo Benichi [Thu, 29 Jun 2017 05:04:13 +0000 (14:04 +0900)]
Nat464Xlat: internal state guards cleanup + state enum
This patch does some cleanup of Nat464Xlat internal state guards
against the Nat464Xlat state Idle | Started | Running, which reduces
code nesting.
It also replaces introspection of internal state for distinguishing
between different stages in 464xlat lifecycle with an enum explicitly
introducing these three Idle | Started | Running states.
Bug:
62997041
Bug:
64571917
Test: runtest frameworks-net
manually connected to ipv6 network and went to test-ipv6.com
Change-Id: I6efc9fed2420ca488731a2b9b9c3c025b16eca10
Hugo Benichi [Tue, 27 Jun 2017 06:13:20 +0000 (15:13 +0900)]
Nat464Xlat: clat management cleanup
This patch does some minor refactoring of clat starting/stopping code:
- remove unused LinkProperties arguments in updateClat
- remove unused Context argument in Nat464Xlat ctor
- introduce ensureClatIsStarted and ensureClatIsStopped methods and
simplify updateClat
- add clatd to NetworkAgentInfo toString() method
- clarify some comments
This changes prepare for moving BaseNetworkObserver callbacks to
ConnectivityService.
Bug:
62997041
Bug:
64571917
Test: runtest frameworks-net
manually connected to IPv6 only network and went to test-ipv6.com
Change-Id: Idb204784614cfe700f73255a7a7b78c5e9ee6eca
Treehugger Robot [Sat, 26 Aug 2017 00:24:23 +0000 (00:24 +0000)]
Merge "DeviceInfoUtils.java: support to show kernel version compiled with clang"
Lingjun Li [Fri, 25 Aug 2017 20:16:16 +0000 (13:16 -0700)]
Whitelist free sms shortcode 76551 in Mexico for constlletion.
Constellation team has acquire a free shortcode 76551 in Mexico
for contellation MO verification. We don't want to scare people
by poping up the non-necessary warning dialog.
BUG:
65050702
Test: manual
Change-Id: Iab79032f31f99c80a750e02be0f1e6c32aa85363