OSDN Git Service
Ahmed ElArabawy [Fri, 1 Sep 2017 06:43:37 +0000 (06:43 +0000)]
Merge "Add APF black list for ether-type" am:
c6b2e356b6
am:
b7cabe7b59
Change-Id: I3aeb9bedd2503a2182995d13b26de0f89e94ce9d
Ahmed ElArabawy [Fri, 1 Sep 2017 06:28:51 +0000 (06:28 +0000)]
Merge "Add APF black list for ether-type"
am:
c6b2e356b6
Change-Id: I2aca562191119dc26eb7bc5293956061e5f44827
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
Mårten Kongstad [Thu, 31 Aug 2017 22:03:09 +0000 (22:03 +0000)]
Merge "Remove unused methods from OMS" am:
fd5cdfc924
am:
55a2494df3
Change-Id: Id985902c3eadcacac645ba545ad07fdee9801284
Mårten Kongstad [Thu, 31 Aug 2017 21:53:08 +0000 (21:53 +0000)]
Merge changes I7218f17a,I96b7340a am:
111c955d1d
am:
96e763fe71
Change-Id: I21e3d230c91a76b77287d13c93a87db2f197e7d7
Mårten Kongstad [Thu, 31 Aug 2017 21:51:02 +0000 (21:51 +0000)]
Merge "Remove unused methods from OMS"
am:
fd5cdfc924
Change-Id: I97fc7e6400a8221c78cf4f94be0089037bcae929
Mårten Kongstad [Thu, 31 Aug 2017 21:44:25 +0000 (21:44 +0000)]
Merge changes I7218f17a,I96b7340a
am:
111c955d1d
Change-Id: I64cb964b751561e87115976866646b1db3858e14
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
Mårten Kongstad [Thu, 31 Aug 2017 21:14:06 +0000 (21:14 +0000)]
Merge "OMS: fix listener callbacks triggered by changes to target package" am:
637dbcbb6c
am:
c2351d1d40
Change-Id: I2222b2ed2479a748cf3124357f91701afe4bd04f
Mårten Kongstad [Thu, 31 Aug 2017 21:03:40 +0000 (21:03 +0000)]
Merge "OMS: fix listener callbacks triggered by changes to target package"
am:
637dbcbb6c
Change-Id: I14d16f460146ac49d89334e41409a90908f04671
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 20:07:28 +0000 (20:07 +0000)]
Merge "Whitelist free sms shortcode 76551 in Mexico for constlletion." am:
4bddd5c44b
am:
2e1c643919
Change-Id: Iee6c3304bd4db32e05ab7a44ade5d152358bcb4f
lingjunl [Thu, 31 Aug 2017 19:57:19 +0000 (19:57 +0000)]
Merge "Whitelist free sms shortcode 76551 in Mexico for constlletion."
am:
4bddd5c44b
Change-Id: Ic2a1ae0ee1560870f01289925a978b9b11b860cc
lingjunl [Thu, 31 Aug 2017 19:46:39 +0000 (19:46 +0000)]
Merge "Whitelist free sms shortcode 76551 in Mexico for constlletion."
Zheng Zhang [Thu, 31 Aug 2017 17:48:47 +0000 (17:48 +0000)]
Merge changes I30e39943,I4b5fb782,I8fe0ddbd into cw-f-dev am:
1c0dba5014 am:
80a0f290f6 am:
e274cd7ae9
am:
a8441ebf84
Change-Id: If62141ca2c08426492339356576bf9b821ba9fa6
Zheng Zhang [Thu, 31 Aug 2017 17:47:22 +0000 (17:47 +0000)]
DO NOT MERGE ANYWHERE: Listen TRANSPORT_BLUETOOTH network change in GnssLocationProvider am:
03c0f16f37 -s ours am:
d877297ad4 -s ours am:
6f94a3740a -s ours
am:
2a540e9970 -s ours
Change-Id: I3f2b00b74cb5e2bc12e4da1d8536dde13603bfd4
Zheng Zhang [Thu, 31 Aug 2017 17:37:44 +0000 (17:37 +0000)]
Merge changes I30e39943,I4b5fb782,I8fe0ddbd into cw-f-dev am:
1c0dba5014 am:
80a0f290f6
am:
e274cd7ae9
Change-Id: Ibc2a01cbfbc33c1ee07486b5556a91b9ebeaa532
Zheng Zhang [Thu, 31 Aug 2017 17:36:50 +0000 (17:36 +0000)]
DO NOT MERGE ANYWHERE: Listen TRANSPORT_BLUETOOTH network change in GnssLocationProvider am:
03c0f16f37 -s ours am:
d877297ad4 -s ours
am:
6f94a3740a -s ours
Change-Id: I12d33400af3e2f3c358839380ddee7fb8791e839
wuliang [Thu, 31 Aug 2017 17:04:19 +0000 (17:04 +0000)]
Merge "Test: Drag on the divider line." am:
1fa3a60f05
am:
290bfff7d0
Change-Id: Ifcb2f065e5be1195e2bd899bd9b9052b2712631f
wuliang [Thu, 31 Aug 2017 16:54:54 +0000 (16:54 +0000)]
Merge "Test: Drag on the divider line."
am:
1fa3a60f05
Change-Id: I8c33a5bddf76f70eec8c21fe850887b51fdfaa74
Treehugger Robot [Thu, 31 Aug 2017 16:43:44 +0000 (16:43 +0000)]
Merge "Test: Drag on the divider line."
Andreas Gampe [Thu, 31 Aug 2017 15:27:52 +0000 (15:27 +0000)]
Merge changes I49057737,I68e3096d am:
50cf621704
am:
f5dcc28b0c
Change-Id: Id25418e3def0b63a8c52671546968017cf350d18
Andreas Gampe [Thu, 31 Aug 2017 15:15:31 +0000 (15:15 +0000)]
Merge changes I49057737,I68e3096d
am:
50cf621704
Change-Id: Id66d91bc326461dc3cae4cbae03f3d060761ea7f
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:48:46 +0000 (14:48 +0000)]
Merge "Revert "Nat464Xlat: interface notification handler on ConnectivityService"" am:
1d66352b40
am:
4c1b0ae343
Change-Id: Ibb3a382ad45a708c63a3d7f4d3be0bf54881403a
Hugo Benichi [Thu, 31 Aug 2017 14:39:18 +0000 (14:39 +0000)]
Merge "Revert "Nat464Xlat: interface notification handler on ConnectivityService""
am:
1d66352b40
Change-Id: I691095ce56e30e2fada93bc5500453f13ac51403
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
Kevin Chyn [Thu, 31 Aug 2017 12:59:00 +0000 (12:59 +0000)]
Update UnlockMethodCache when screen turns off
am:
08ae664365
Change-Id: I416497c2ffeca295b9620a6d1d6f9868935dd25a
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
Erik Kline [Thu, 31 Aug 2017 03:45:23 +0000 (03:45 +0000)]
Merge "Shutdown more reliably" am:
549c3d2e4f
am:
7e5b415861
Change-Id: Id2bd17e649d28cc484292e1f1ec5644c014bc395
Erik Kline [Thu, 31 Aug 2017 03:30:55 +0000 (03:30 +0000)]
Merge "Shutdown more reliably"
am:
549c3d2e4f
Change-Id: I9ff7e6ee49bb88f9a63b269d57d5e91ed6ddec31
Treehugger Robot [Thu, 31 Aug 2017 03:11:51 +0000 (03:11 +0000)]
Merge "Shutdown more reliably"
Kevin Chyn [Thu, 31 Aug 2017 02:02:43 +0000 (19:02 -0700)]
Update UnlockMethodCache when screen turns off
Fixes:
65212307
Test: 1) add a temporary log in update()
2) turn off screen, make sure update() is called, and
canSkipBouncer value is updated and correct
Change-Id: I576d2375d38e83f286ad1fc6aa25944326c3ef8f
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
Phil Weaver [Wed, 30 Aug 2017 23:40:22 +0000 (23:40 +0000)]
Merge "resolve merge conflicts of
490d397d284f to oc-dr1-dev" into oc-dr1-dev
am:
0ddaa63b67
Change-Id: I84cdc92d542597541266fe506b4a3af160d970b2
Phil Weaver [Wed, 30 Aug 2017 22:54:59 +0000 (22:54 +0000)]
Merge "resolve merge conflicts of
490d397d284f to oc-dr1-dev" into oc-dr1-dev
Edward Savage-Jones [Wed, 30 Aug 2017 21:10:58 +0000 (21:10 +0000)]
Merge "IllegalArgumentException in MagnificationGestureHandler" am:
7aff46195e
am:
f124c72600
Change-Id: I664ad0b3d09036bb2bbb0f0ce2e56d22ca042e7e
Edward Savage-Jones [Wed, 30 Aug 2017 20:57:27 +0000 (20:57 +0000)]
Merge "IllegalArgumentException in MagnificationGestureHandler"
am:
7aff46195e
Change-Id: I3822533c2d7d01c7d804cfd6ad914d36f5ef482f
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:46:45 +0000 (00:46 +0000)]
Merge "Fix errorprone build" am:
3abddeca75 -s ours
am:
069915cd1c -s ours
Change-Id: Ifb99a846c309f83f5d31cc81a88ca339787cf68b
Colin Cross [Wed, 30 Aug 2017 00:36:36 +0000 (00:36 +0000)]
Merge "Fix errorprone build"
am:
3abddeca75 -s ours
Change-Id: I9eb51d858194869763c94260beeec05aac6578ee
Colin Cross [Wed, 30 Aug 2017 00:25:36 +0000 (00:25 +0000)]
Merge "Fix errorprone build"
Phil Weaver [Tue, 29 Aug 2017 20:43:01 +0000 (13:43 -0700)]
resolve merge conflicts of
490d397d284f to oc-dr1-dev
Bug:
62196835
Test: I solemnly swear I tested this conflict resolution.
Merged-In: I1a3e3c5b1696a5f5b95eac187acb5a03863b4a0b
Change-Id: Ib00a23ae9a329cfc102b1a116b5a585be36b56f6
Bill Yi [Tue, 29 Aug 2017 21:06:33 +0000 (21:06 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am:
db61e7ec73 -s ours
Change-Id: Ifb8aae76ed66234e0e39d538d84e2567f9e26003
TreeHugger Robot [Tue, 29 Aug 2017 20:53:24 +0000 (20:53 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
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
Zheng Zhang [Tue, 29 Aug 2017 18:58:35 +0000 (18:58 +0000)]
Merge changes I30e39943,I4b5fb782,I8fe0ddbd into cw-f-dev am:
1c0dba5014
am:
80a0f290f6
Change-Id: I3aa52949efe603e94ca7c84c4db8212ebe195822
Zheng Zhang [Tue, 29 Aug 2017 18:57:52 +0000 (18:57 +0000)]
DO NOT MERGE ANYWHERE: Listen TRANSPORT_BLUETOOTH network change in GnssLocationProvider am:
03c0f16f37 -s ours
am:
d877297ad4 -s ours
Change-Id: If2056d42363944e8f251fde45199e43fa6ca6509
Zheng Zhang [Tue, 29 Aug 2017 18:46:23 +0000 (18:46 +0000)]
Merge changes I30e39943,I4b5fb782,I8fe0ddbd into cw-f-dev
am:
1c0dba5014
Change-Id: I45f36e954ad432bbb5117b50ab2b7c56974afdbd
Zheng Zhang [Tue, 29 Aug 2017 18:46:20 +0000 (18:46 +0000)]
DO NOT MERGE ANYWHERE: Listen TRANSPORT_BLUETOOTH network change in GnssLocationProvider
am:
03c0f16f37 -s ours
Change-Id: I1e3ec0a6a8e861c10a6c7f19cc080b546d1bbd65
TreeHugger Robot [Tue, 29 Aug 2017 18:35:04 +0000 (18:35 +0000)]
Merge changes I30e39943,I4b5fb782,I8fe0ddbd into cw-f-dev
* changes:
DO NOT MERGE ANYWHERE: Listen TRANSPORT_BLUETOOTH network change in GnssLocationProvider
DO NOT MERGE ANYWHERE: GnssLocationProvider: listening to conn lost event
DO NOT MERGE ANYWHERE: Restoring Network Available Notification to AGnssRil
Phil Weaver [Tue, 29 Aug 2017 18:08:54 +0000 (18:08 +0000)]
Merge "Backport overlay security fix" into oc-dev
Jason Monk [Tue, 29 Aug 2017 14:49:42 +0000 (14:49 +0000)]
Merge "Fix QS user icon in guest mode" am:
7d4e9b81b4
am:
526cd8923f
Change-Id: I91836c0d28cefbe5965586609d6eb521c8c2158a
Jason Monk [Tue, 29 Aug 2017 14:40:47 +0000 (14:40 +0000)]
Merge "Fix QS user icon in guest mode"
am:
7d4e9b81b4
Change-Id: I144ab6fea2e9ece6f01004c03c85da72a8c069f2
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 14:04:40 +0000 (14:04 +0000)]
Merge "Adapt ICU 59 API update to Doclava changes." am:
e048261656
am:
0fc0cc9dd8
Change-Id: I93b14c129711fad75fee3aa34f3a0fed04eb1182
Joachim Sauer [Tue, 29 Aug 2017 13:54:14 +0000 (13:54 +0000)]
Merge "Adapt ICU 59 API update to Doclava changes."
am:
e048261656
Change-Id: Iea671a7029e083bffee2bcaacfaa0df41f45c1cc
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:19:50 +0000 (08:19 +0000)]
Merge "Fix GATT client leakage when scan is throttled (1/2)" am:
3cc1ad87f0
am:
d019cce887
Change-Id: I24d4dbf1344b13c558aa6974dfee6fd0e8549056
Jakub Pawlowski [Tue, 29 Aug 2017 08:09:15 +0000 (08:09 +0000)]
Merge "Fix GATT client leakage when scan is throttled (1/2)"
am:
3cc1ad87f0
Change-Id: Ieda555f6f8bda35201327c6c6e0c97621b88671e
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:31:38 +0000 (05:31 +0000)]
Merge "Nat464Xlat: interface notification handler on ConnectivityService" am:
91817b3129
am:
02f6cfa49e
Change-Id: Ib224392c9a185f6bd79fd60cd5cb5549f2a7851e
Hugo Benichi [Tue, 29 Aug 2017 05:20:32 +0000 (05:20 +0000)]
Merge "Nat464Xlat: interface notification handler on ConnectivityService"
am:
91817b3129
Change-Id: I2f002cd197e2eeaaadadd747a6b33d264cd34433
Hugo Benichi [Tue, 29 Aug 2017 05:08:00 +0000 (05:08 +0000)]
Merge "Nat464Xlat: interface notification handler on ConnectivityService"
Phil Weaver [Sat, 19 Aug 2017 01:01:46 +0000 (18:01 -0700)]
Backport overlay security fix
Replacing app opps fix with the flag that is used
elsewhere.
Bug:
37442941
Test: Verified that toast and system overlay still goes
away on permission and a11y service capability screens.
Merged-In: I1a3e3c5b1696a5f5b95eac187acb5a03863b4a0b
Change-Id: If9bec515105369055415d54c7fcad7a65431f8e7
Colin Cross [Tue, 29 Aug 2017 00:15:35 +0000 (00:15 +0000)]
Merge "Use guava 21.0" am:
edb2e0c722
am:
f1c99fb47f
Change-Id: I8349115cf2b7678ac6e24ea2aa06ed59bffa5930
Colin Cross [Tue, 29 Aug 2017 00:03:24 +0000 (00:03 +0000)]
Merge "Use guava 21.0"
am:
edb2e0c722
Change-Id: Icf8873b268677a631659a7ee0f7816495f6acd38
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"
Zheng Zhang [Tue, 22 Aug 2017 17:27:14 +0000 (10:27 -0700)]
DO NOT MERGE ANYWHERE: Listen TRANSPORT_BLUETOOTH network change in GnssLocationProvider
TRANSPORT_BLUETOOTH is a essential network type for wearable device.
For non-master branch, only listen to Bluetooth on wearable device.
Bug:
64881794
Test: Trigger Bluetooth on/off on watch, check if UpdateNetworkState()
got called.
Change-Id: I30e39943220597987320ea7843d7d36827fdd0c7
(cherry picked from commit
d6886710b5c9ed9d1567c4ee59773071bae7070c)
Hugo Benichi [Mon, 28 Aug 2017 23:01:36 +0000 (23:01 +0000)]
Merge "Nat464Xlat: internal state guards cleanup + state enum" am:
aee703e7e4
am:
20d4df8cc1
Change-Id: Ic2246a97618c596dbdbf48cda39c2f5b66e3bfb6
Hugo Benichi [Mon, 28 Aug 2017 22:49:50 +0000 (22:49 +0000)]
Merge "Nat464Xlat: internal state guards cleanup + state enum"
am:
aee703e7e4
Change-Id: I188ac4c367db11cb33b67fe92df3a120e3c6fbce
bokyung.kim [Mon, 28 Aug 2017 22:37:39 +0000 (22:37 +0000)]
Merge "Fixed mimetype error of PPT file" am:
3c28e2b280
am:
148414cd2c
Change-Id: I73f527fd006a39f00dafbe0b8c85cd583cf283f7
Hugo Benichi [Mon, 28 Aug 2017 22:30:27 +0000 (22:30 +0000)]
Merge "Nat464Xlat: internal state guards cleanup + state enum"
bokyung.kim [Mon, 28 Aug 2017 22:27:38 +0000 (22:27 +0000)]
Merge "Fixed mimetype error of PPT file"
am:
3c28e2b280
Change-Id: I24b9dcf6506c53e26b901f74442f64bb28198611
Treehugger Robot [Mon, 28 Aug 2017 22:12:37 +0000 (22:12 +0000)]
Merge "Fixed mimetype error of PPT file"
Bill Yi [Mon, 28 Aug 2017 20:23:48 +0000 (20:23 +0000)]
Import translations. DO NOT MERGE
am:
e0fec63824 -s ours
Change-Id: Iac255ef2407c7e3ff393fb01124d9a052bcde728
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>
xulicheng [Mon, 28 Aug 2017 20:11:08 +0000 (20:11 +0000)]
Merge "Ensure the generation is not changed before put value to cache" am:
11ae580f81
am:
489f2c2c48
Change-Id: Idab1a2d1f4ee8cc28a38c3c82ea9a8ad7f9d3bf4
xulicheng [Mon, 28 Aug 2017 19:58:06 +0000 (19:58 +0000)]
Merge "Ensure the generation is not changed before put value to cache"
am:
11ae580f81
Change-Id: I5bf2c557f6f46f1455204761a9045b8b90d7ea32
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
Lorenzo Colitti [Mon, 28 Aug 2017 12:58:30 +0000 (12:58 +0000)]
Merge "Trivial change to test expectations." am:
c0d8300b32
am:
3dd0137ee5
Change-Id: I40e6535b22688b47845e6c57d3f13963bc8a6201
Lorenzo Colitti [Mon, 28 Aug 2017 12:49:29 +0000 (12:49 +0000)]
Merge "Trivial change to test expectations."
am:
c0d8300b32
Change-Id: I58155e3edb424ea6918a3d2bb8e284e61346765f
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 12:11:28 +0000 (12:11 +0000)]
Merge "Nat464Xlat: clat management cleanup" am:
81b179cfdd
am:
b6805dc02f
Change-Id: I1a19e6fbb0cb13262e90b171d861062469078fb6
Hugo Benichi [Mon, 28 Aug 2017 12:01:25 +0000 (12:01 +0000)]
Merge "Nat464Xlat: clat management cleanup"
am:
81b179cfdd
Change-Id: Ic3808a1afe48efac745b1b378fb12cc5678918ec
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