OSDN Git Service
Calin Juravle [Fri, 3 Mar 2017 03:56:13 +0000 (03:56 +0000)]
Merge changes from topic 'secondary-dex1' am:
d56d98b860
am:
e6f3ed6aef
Change-Id: Ia637e1c6caccf33137cde413779911dab5677147
Calin Juravle [Fri, 3 Mar 2017 03:51:04 +0000 (03:51 +0000)]
Merge changes from topic 'secondary-dex1'
am:
d56d98b860
Change-Id: Ia9c1329584597a6f30aeaa2bd8e8c979705d8eea
Calin Juravle [Fri, 3 Mar 2017 03:42:33 +0000 (03:42 +0000)]
Merge changes from topic 'secondary-dex1'
* changes:
Use DexManager logic to decide if a package is used by other apps
Skip class path checking for secondary dex files
Calin Juravle [Thu, 2 Mar 2017 03:55:35 +0000 (19:55 -0800)]
Use DexManager logic to decide if a package is used by other apps
Stop relying on the file marker recorded by the runtime. We have the
same data available from the DexManager.
The clean up CL to remove the handling of the file markers will follow.
Test: verify that "shared packages" (e.g. gmscore) are not compiled with speed-profile.
Bug:
32871170
(cherry picked from commit
07b6eabe79261267ecd7114790e96e1f6828672a)
Change-Id: I2969b75fa77d38dde0073ef67aa89b1dc91237b5
Merged-In: I6cc5834ac88489e69896cd5fba9ed9968aa7f5a2
Calin Juravle [Wed, 15 Feb 2017 01:53:13 +0000 (17:53 -0800)]
Skip class path checking for secondary dex files
Pass '&' marker to dex2oat classpath when compiling secondary dex files.
This will skip class path checking when loading the oat files.
Test: adb shell cmd package compile -m speed -f --secondary-dex com.google.android.gms
oatdump --header-only --oat-
file=/data/user/0/com.google.android.gms/app_chimera/m/
00000006/oat/arm64/DynamiteModulesC_GmsCore_prodmnc_alldpi_release
check that the class path contains the special '&' marker
Bug:
32871170
(cherry picked from commit
aae35767b6bca6f872c906a0fd38d7adb61217bd)
Change-Id: I7f3c6743e749316ee02e8586a525ad28ae1ef765
Merged-In: If0628aeb4e3f5717604bfc4a87a4b1d438e5fa65
Elliott Hughes [Fri, 3 Mar 2017 00:37:18 +0000 (00:37 +0000)]
Merge "Remove the name length limit for system properties." am:
c657b769ab
am:
6f00e6e977
Change-Id: If2daf92e3b7aed37832aa0787a2c689d8bdedd97
Elliott Hughes [Fri, 3 Mar 2017 00:30:10 +0000 (00:30 +0000)]
Merge "Remove the name length limit for system properties."
am:
c657b769ab
Change-Id: I700b379c0482d7d9609183a39a5c9664746ea5aa
Calin Juravle [Fri, 3 Mar 2017 00:29:42 +0000 (00:29 +0000)]
Merge changes from topic 'secondary-dex' am:
9e88c53337
am:
a400ccdaa0
Change-Id: I95ed98e02fe5a54699814eb617697852095ca55d
Calin Juravle [Fri, 3 Mar 2017 00:28:38 +0000 (00:28 +0000)]
Save package dex usage info after secondary dex reconciliation am:
61fd6eab46
am:
ade90057c6
Change-Id: I094a69564b25f84ed36b51b9064c4bb499088802
Calin Juravle [Fri, 3 Mar 2017 00:27:44 +0000 (00:27 +0000)]
Compile secondary dex files during background dexopt job am:
574994afde
am:
112a61bf32
Change-Id: I2fd8f38ad11b9ba8e4eeff21b76356eb3c66a762
Calin Juravle [Fri, 3 Mar 2017 00:26:33 +0000 (00:26 +0000)]
Add a shell command to force the background dexopt job am:
f7edab63d9
am:
90ac28d618
Change-Id: I3fef4ed490036753841e09760ec929c24da0a198
Calin Juravle [Fri, 3 Mar 2017 00:25:41 +0000 (00:25 +0000)]
A bit more refactoring in BackgroundDexOptService am:
a57ef16375
am:
a0358c9e32
Change-Id: Ie1e511761121f13bf106dd888129d5e3b168b818
Calin Juravle [Fri, 3 Mar 2017 00:24:38 +0000 (00:24 +0000)]
[PM] Clean up logic for secondary dex oat files am:
e69fba3f7f
am:
110e897eaa
Change-Id: I83d161595df4d1fee18652b8432a1950fb6f367d
Calin Juravle [Fri, 3 Mar 2017 00:23:39 +0000 (00:23 +0000)]
Compile secondary dex files in DexManager am:
7218363a92
am:
468be64cf2
Change-Id: Ie0ebc07e2cf4fd4892b9171e1823d63414eef194
Calin Juravle [Fri, 3 Mar 2017 00:22:33 +0000 (00:22 +0000)]
Notify DexManager about new package installs am:
fcd672fca3
am:
27ea592098
Change-Id: I3a71f8d4a6fcdad25b0b90a800d109bdeb16b3eb
Elliott Hughes [Fri, 3 Mar 2017 00:22:30 +0000 (00:22 +0000)]
Merge "Remove the name length limit for system properties."
Calin Juravle [Fri, 3 Mar 2017 00:13:57 +0000 (00:13 +0000)]
Merge changes from topic 'secondary-dex'
am:
9e88c53337
Change-Id: I77e80eaf9274a64348c80b251e865ecdb6e53dbc
Calin Juravle [Fri, 3 Mar 2017 00:12:19 +0000 (00:12 +0000)]
Save package dex usage info after secondary dex reconciliation
am:
61fd6eab46
Change-Id: I90a95645e9d2acf1b2377e165a64b34b1a678295
Calin Juravle [Fri, 3 Mar 2017 00:10:42 +0000 (00:10 +0000)]
Compile secondary dex files during background dexopt job
am:
574994afde
Change-Id: I204983f6221c07467b450ea9e0bf71b6d15926e1
Calin Juravle [Fri, 3 Mar 2017 00:08:50 +0000 (00:08 +0000)]
Add a shell command to force the background dexopt job
am:
f7edab63d9
Change-Id: Ie77bc356a9ff4786c23a06d1267dc7ca5e45a90a
Calin Juravle [Fri, 3 Mar 2017 00:06:59 +0000 (00:06 +0000)]
A bit more refactoring in BackgroundDexOptService
am:
a57ef16375
Change-Id: Ic258b5484eedcc68650b474acb4fa3eae8589c82
Calin Juravle [Fri, 3 Mar 2017 00:05:07 +0000 (00:05 +0000)]
[PM] Clean up logic for secondary dex oat files
am:
e69fba3f7f
Change-Id: I223b27221acf25e628003dde0f63cffe66779753
Calin Juravle [Fri, 3 Mar 2017 00:03:17 +0000 (00:03 +0000)]
Compile secondary dex files in DexManager
am:
7218363a92
Change-Id: I53e7864b097cf9cff702e9185bb1c9091d97fe63
Calin Juravle [Fri, 3 Mar 2017 00:01:03 +0000 (00:01 +0000)]
Notify DexManager about new package installs
am:
fcd672fca3
Change-Id: I63514deebef293d52f7811023b0915cf655514f6
Calin Juravle [Thu, 2 Mar 2017 23:54:22 +0000 (23:54 +0000)]
Merge changes from topic 'secondary-dex'
* changes:
Fix typo in dexopt.secondary system property
Save package dex usage info after secondary dex reconciliation
Compile secondary dex files during background dexopt job
Add a shell command to force the background dexopt job
A bit more refactoring in BackgroundDexOptService
[PM] Clean up logic for secondary dex oat files
Compile secondary dex files in DexManager
Notify DexManager about new package installs
Peter Qiu [Thu, 2 Mar 2017 22:26:00 +0000 (22:26 +0000)]
Merge "hotspot2: expose string constants for cert type and auth methods" am:
603fb2ef56
am:
d919593b9d
Change-Id: I04651e913216903316e8625672cf62609e76058d
Peter Qiu [Thu, 2 Mar 2017 22:21:27 +0000 (22:21 +0000)]
Merge "hotspot2: expose string constants for cert type and auth methods"
am:
603fb2ef56
Change-Id: I6ae4811e97a99c04a423c1390d87a8c21f4ae416
Elliott Hughes [Thu, 2 Mar 2017 02:47:56 +0000 (18:47 -0800)]
Remove the name length limit for system properties.
Bug: http://b/
33926793
Test: builds
Change-Id: Ib89b66b7abebc9a28961a0c9032b99947e3db0d6
Merged-In: Ib89b66b7abebc9a28961a0c9032b99947e3db0d6
Treehugger Robot [Thu, 2 Mar 2017 22:11:00 +0000 (22:11 +0000)]
Merge "hotspot2: expose string constants for cert type and auth methods"
Calin Juravle [Tue, 7 Feb 2017 19:09:01 +0000 (11:09 -0800)]
Fix typo in dexopt.secondary system property
Test: adb shell cmd package bg-dexopt-job
Bug:
32871170
(cherry picked from commit
4466c5ad84e4429284b7d5e13ad8a87c924ea7fc)
Change-Id: Ibfe3111198877ed0d758b68be89afb23c4756053
Merged-In: Ic8a14a3fc5c9aa63f6cb376f337b5bf459997325
Calin Juravle [Fri, 27 Jan 2017 02:53:23 +0000 (18:53 -0800)]
Save package dex usage info after secondary dex reconciliation
Bug:
1833991
Test: add a bogus entry to /syste/data/package-dex-usage.list
adb shell cmd package reconcile-secondary-dex-files
com.android.google.gms
wait a bit and check the bogus entry is gone
(cherry picked from commit
b1097411028103b6c88ce325af23d2ff1ec746c8)
Change-Id: I23248b11ea07bceb6527f55bf62618d1b2c3d83d
Merged-In: Ic07126bfb8730933081a5e010e3c357d338786e8
Calin Juravle [Thu, 26 Jan 2017 02:00:05 +0000 (18:00 -0800)]
Compile secondary dex files during background dexopt job
Extend the backgound dexopt job to compile secondary dex files when
"dalvik.vm.deopt.secondary" system property is set to true.
Test: adb shell cmd package bg-dexopt-job
Bug:
32871170
(cherry picked from commit
51f521c3bf46e6040f36757bc53ea57ddc7be85e)
Change-Id: I220ff4ea26c4eee030ab1a9f4c957a09aa9f2f4c
Merged-In: If3a4b77f785e92c7f2f7869e25ff9b99904f165a
Calin Juravle [Thu, 26 Jan 2017 01:16:08 +0000 (17:16 -0800)]
Add a shell command to force the background dexopt job
Add 'bg-dexopt-job' command to 'adb shell cmd package' which will force
the background dexopt job to run the optimizations immediately.
Note that the command only runs the background optimizer logic. It may
overlap with the actual job but the job scheduler will not be able to
cancel it. It will also run even if the device is not in the idle
maintenance mode.
Test: adb shell cmd package bg-dexopt-job
Bug:
32871170
(cherry picked from commit
cb5f41ea11b1a6fcd0977a64ee146dde8f537076)
Change-Id: I82c781d46fe16e7b7566a5b5ee91be723a2125cb
Merged-In: I8b0112074220b2e09baf13d842401ee1cf306a89
Calin Juravle [Thu, 26 Jan 2017 01:08:03 +0000 (17:08 -0800)]
A bit more refactoring in BackgroundDexOptService
Extract convenient methods to help with:
- adding a shell command to run the background dexopt job
- extending idleOptimizations to cover secondary dex files
Test: device boots, background job run.
Bug:
32871170
(cherry picked from commit
c660475aafe91269be306c802823cf543005ce36)
Change-Id: I146e4faeea90f2d58144a5dba26ae7f90a36b402
Merged-In: I18fde62a1cb05c030a620722d5f217589beaefb1
Calin Juravle [Wed, 25 Jan 2017 09:05:50 +0000 (01:05 -0800)]
[PM] Clean up logic for secondary dex oat files
Add logic in DexManager to reconcile secondary dex records with the
actual files on disk. If secondary dex files are moved or removed then
DexManager will remove the generated oat files during the call to
reconcileSecondaryOdex() and update its internal state.
Add 'adb shell cmd package reconcile-secondary-dex packageName' which
will force DexManager to sync its data with the actual secondary dex
files.
Test: devices bots
runtest -x .../PackageDexUsageTests.java
runtest -x .../DexManagerTests.java
adb shell cmd package reconcile-secondary-dex
com.android.google.gms (after artificially/temporarily renaming some
dex files)
Bug:
32871170
(cherry picked from commit
c22c30ed1c05c5c24185dc4d380d1c5026923d46)
Change-Id: Ied9fcbfe367ed3a8250a9ba8d202518b264c64e8
Merged-In: Id2d72dc89995f89cf1ddf79ae4e992afd3f3c127
Calin Juravle [Tue, 17 Jan 2017 03:18:48 +0000 (19:18 -0800)]
Compile secondary dex files in DexManager
Add logic for secondary dex compilation in DexManager. Also, extend the
`cmd package compile` command with '--secondary-dex' option which will
compile all used secondary dex files for the given package.
Test: flash & boot,
cmd package compile --secondary-dex -f -m speed
com.google.android.gms
Bug:
32871170
(cherry picked from commit
c22c30ed1c05c5c24185dc4d380d1c5026923d46)
Change-Id: I3cf26edbfb5e9f3683e608bb2a596e1ab5682bd4
Merged-In: Ia2b95cb70d26c4ead5cb650047641b0881ca84ae
Calin Juravle [Tue, 24 Jan 2017 07:34:25 +0000 (23:34 -0800)]
Notify DexManager about new package installs
This will update the internal cache so that the secondary dex files of
the new package can be found when loaded.
Test: runtest -x .../DexManagerTests.java
Bug:
32871170
(cherry picked from commit
0d4b8f8b0c963d9a1f5cb6aff11a11195a3df225)
Change-Id: I34008f6d262f19e88a346a36b83e4093b4129105
Merged-In: I0cb7158af249feeb01cf578a7544dda978eede9d
Shubham Ajmera [Thu, 2 Mar 2017 17:36:11 +0000 (17:36 +0000)]
Merge "Fix Javadoc for StrictMode#permitUnbufferdIo" am:
b8648ae07a
am:
c847aae2cf
Change-Id: Ic8a35213b2699c28a0427a0930b330a3a35a34ad
Shubham Ajmera [Thu, 2 Mar 2017 17:32:14 +0000 (17:32 +0000)]
Merge "Fix Javadoc for StrictMode#permitUnbufferdIo"
am:
b8648ae07a
Change-Id: I86adc3e40c083c999b717384ae38e437a17a9557
Treehugger Robot [Thu, 2 Mar 2017 17:23:45 +0000 (17:23 +0000)]
Merge "Fix Javadoc for StrictMode#permitUnbufferdIo"
Hugo Benichi [Thu, 2 Mar 2017 08:08:01 +0000 (08:08 +0000)]
Merge "ConnectivityManager: no double NetworkCallback registration" am:
06a192fa49
am:
5983a772cb
Change-Id: Ic36fbd67d92df0d9f70fe26d6aee92ee782bfb3c
Hugo Benichi [Thu, 2 Mar 2017 08:04:03 +0000 (08:04 +0000)]
Merge "ConnectivityManager: no double NetworkCallback registration"
am:
06a192fa49
Change-Id: I250fa7d3c5e37a66caa41cc898a44bcb18c9a0c4
Treehugger Robot [Thu, 2 Mar 2017 07:56:24 +0000 (07:56 +0000)]
Merge "ConnectivityManager: no double NetworkCallback registration"
Hugo Benichi [Fri, 3 Feb 2017 06:55:42 +0000 (15:55 +0900)]
ConnectivityManager: no double NetworkCallback registration
Test: new test in ConnectivityManagerTest
Bug:
20701525
Change-Id: I205333d31d43e6e6c7fe704ce63b458065f345ce
Jack Yu [Thu, 2 Mar 2017 06:18:13 +0000 (06:18 +0000)]
Merge "Added two new RIL commands support" am:
d7b60d7869
am:
01cfdb4f3a
Change-Id: I40948d26d865336a31e6305012d828c6630e1e99
Jack Yu [Thu, 2 Mar 2017 06:11:24 +0000 (06:11 +0000)]
Merge "Added two new RIL commands support"
am:
d7b60d7869
Change-Id: I28f1e0192db63a302daa69c2e6b13762fcbfb37b
Treehugger Robot [Thu, 2 Mar 2017 06:02:19 +0000 (06:02 +0000)]
Merge "Added two new RIL commands support"
Jack Yu [Thu, 16 Feb 2017 18:33:38 +0000 (10:33 -0800)]
Added two new RIL commands support
Added RIL_REQUEST_SEND_DEVICE_STATE and
RIL_REQUEST_SET_UNSOLICITED_RESPONSE_FILTER RIL requests support.
Test: telephony sanity tests
bug:
32223897,
20125037,
28294587
Merged-In: I148a4322dfab2d8d84faf6505fb89dfc290411e3
Change-Id: I148a4322dfab2d8d84faf6505fb89dfc290411e3
Elliott Hughes [Thu, 2 Mar 2017 03:07:33 +0000 (03:07 +0000)]
Merge "Basic javadoc for android.os.UpdateEngine." am:
cbafc8d682
am:
91c1048bc7
Change-Id: I2130b49b61ee93ec79f1cd86f72fc98355bdc9cc
Elliott Hughes [Thu, 2 Mar 2017 03:01:34 +0000 (03:01 +0000)]
Merge "Basic javadoc for android.os.UpdateEngine."
am:
cbafc8d682
Change-Id: I927f7e3014d7e27b4e003d2f4f4fdaa7ea0645c5
Elliott Hughes [Thu, 2 Mar 2017 02:52:08 +0000 (02:52 +0000)]
Merge "Basic javadoc for android.os.UpdateEngine."
Paul Stewart [Thu, 2 Mar 2017 00:22:25 +0000 (00:22 +0000)]
Merge "Fix up EAP-SIM documentation" am:
2142b14a88
am:
32655dfa19
Change-Id: I781b6e586b7925262d529056dd5f403e081a3d80
Paul Stewart [Thu, 2 Mar 2017 00:12:43 +0000 (00:12 +0000)]
Merge "Fix up EAP-SIM documentation"
am:
2142b14a88
Change-Id: I944734796ea97fded5cc818899ddf7b41cbeca00
Peter Qiu [Tue, 28 Feb 2017 23:12:16 +0000 (15:12 -0800)]
hotspot2: expose string constants for cert type and auth methods
So that we can use these constants in WifiService and the apps
as well in the future.
While there, remove auth method "CHAP" from the supported list,
since it is currenlty not supported by WifiService.
Bug:
34206769
Test: make -j32
Change-Id: Icadc3b13f2b135d51445d336116fbba86e96b70f
Treehugger Robot [Thu, 2 Mar 2017 00:01:32 +0000 (00:01 +0000)]
Merge "Fix up EAP-SIM documentation"
Tim Zhang [Wed, 1 Mar 2017 23:32:07 +0000 (23:32 +0000)]
Merge "Remove FastJNI optimization on AssetManager to avoid dead lock." am:
4904e7ae2a
am:
07acbea653
Change-Id: I0087c756987e31f45a66928e60e5d8d53e26945a
Tim Zhang [Wed, 1 Mar 2017 23:23:24 +0000 (23:23 +0000)]
Merge "Remove FastJNI optimization on AssetManager to avoid dead lock."
am:
4904e7ae2a
Change-Id: I38169c42b5b5600c0e3d00f0342429b3843f88f8
Treehugger Robot [Wed, 1 Mar 2017 23:13:14 +0000 (23:13 +0000)]
Merge "Remove FastJNI optimization on AssetManager to avoid dead lock."
Tim Zhang [Thu, 16 Feb 2017 01:55:27 +0000 (09:55 +0800)]
Remove FastJNI optimization on AssetManager to avoid dead lock.
I found there was a dead lock among main, android.display and GC threads
when running monkey test.
- Main thread got a mutex and was suspended by GC thread.
- Android.display thread waited for mutex held by main thread.
- GC thread waited for suspention of android.display thread.
This will lead to ANR or screen freeze.
Merged-In: I13cf1eca3cb3b7c01aa754874f2b48aab0b472e8
Change-Id: I13cf1eca3cb3b7c01aa754874f2b48aab0b472e8
Paul Stewart [Fri, 24 Feb 2017 18:21:35 +0000 (10:21 -0800)]
Fix up EAP-SIM documentation
Address API Council comments on doucmentation for the method calls
and constants related to EAP-SIM. While here, improve unit tests
to ensure that passing a null certificate (chain) causes the config
to forget any existing client certificates.
Bug:
35847887
Test: Unit tests
Change-Id: I1c4e18e1a7cfb61aa4764e32778793368938e70b
Yifan Hong [Wed, 1 Mar 2017 21:54:14 +0000 (21:54 +0000)]
Merge "getTransport checks interface and instance names." am:
7f0300f1e2
am:
7719c1ad0d
Change-Id: I8fcb35bdd7325e9bcae169f03142499b2490dd19
Tyler Gunn [Wed, 1 Mar 2017 21:50:32 +0000 (21:50 +0000)]
Merge "Support for showing self-managed calls in IncallService." am:
5a33057092
am:
8c7d28f163
Change-Id: I201275ad6daf66201eb57f9215c6ec88fe65539e
Yifan Hong [Wed, 1 Mar 2017 21:46:05 +0000 (21:46 +0000)]
Merge "getTransport checks interface and instance names."
am:
7f0300f1e2
Change-Id: Ie44e09d89745d2179514c3b9fb8ab80e544e3701
nharold [Wed, 1 Mar 2017 21:44:49 +0000 (21:44 +0000)]
Merge changes from topic 'query-fplmn-sync' am:
0dc62c6dd3
am:
1f7f262920
Change-Id: I9cce740f777f0c881b37cbf4752cd81d7f817a41
Tyler Gunn [Wed, 1 Mar 2017 21:41:04 +0000 (21:41 +0000)]
Merge "Support for showing self-managed calls in IncallService."
am:
5a33057092
Change-Id: I3491e4c099abf8ccc504fcb85109ba1576e34aba
nharold [Wed, 1 Mar 2017 21:37:58 +0000 (21:37 +0000)]
Merge changes from topic 'query-fplmn-sync'
am:
0dc62c6dd3
Change-Id: Ibc08427e8de920f7f95a6a530b45cfcf8402d203
Treehugger Robot [Wed, 1 Mar 2017 21:24:24 +0000 (21:24 +0000)]
Merge "getTransport checks interface and instance names."
Tyler Gunn [Wed, 1 Mar 2017 20:32:55 +0000 (20:32 +0000)]
Merge "Support for showing self-managed calls in IncallService."
nharold [Wed, 1 Mar 2017 20:25:15 +0000 (20:25 +0000)]
Merge changes from topic 'query-fplmn-sync'
* changes:
Provide a public API for TelephonyManager.getForbiddenPlmns()
Add support for querying Forbidden PLMNs
Ajay Nambi [Wed, 1 Mar 2017 19:39:16 +0000 (19:39 +0000)]
Merge "Add DUN to networkAttributes" am:
32d763b0ed
am:
4e8cd7dca6
Change-Id: I802d4cbb1ca1f04d661047c0f4cc0b650295e65c
Ajay Nambi [Wed, 1 Mar 2017 19:35:52 +0000 (19:35 +0000)]
Merge "Add DUN to networkAttributes"
am:
32d763b0ed
Change-Id: I863e700b6b98bc23924d7f146e09c1c2c27f608f
Treehugger Robot [Wed, 1 Mar 2017 19:25:38 +0000 (19:25 +0000)]
Merge "Add DUN to networkAttributes"
ashastry [Wed, 1 Mar 2017 18:27:52 +0000 (18:27 +0000)]
Merge "Permit privileged system apps to send SMS without persisting." am:
3d5504724f
am:
6c567af893
Change-Id: I1a891d3d8abbf506a91a0236fa7380cfa143e988
ashastry [Wed, 1 Mar 2017 18:23:49 +0000 (18:23 +0000)]
Merge "Permit privileged system apps to send SMS without persisting."
am:
3d5504724f
Change-Id: I94cbf0ab94401149905290e395ddf71371aac849
ashastry [Wed, 1 Mar 2017 18:18:46 +0000 (18:18 +0000)]
Merge "Permit privileged system apps to send SMS without persisting."
Etan Cohen [Wed, 1 Mar 2017 17:49:32 +0000 (17:49 +0000)]
Merge "[AWARE] Add data-path security configuration (PMK)" am:
eff6f4fc43
am:
b50d958c4a
Change-Id: I99cdde15f3ea9dc4630ccd09a242f3a1148d33bb
Etan Cohen [Wed, 1 Mar 2017 17:45:42 +0000 (17:45 +0000)]
Merge "[AWARE] Add data-path security configuration (PMK)"
am:
eff6f4fc43
Change-Id: I90b6324a903b6307c084c891d7eba75957e13886
Etan Cohen [Wed, 1 Mar 2017 17:39:14 +0000 (17:39 +0000)]
Merge "[AWARE] Add data-path security configuration (PMK)"
Shubham Ajmera [Wed, 1 Mar 2017 17:26:41 +0000 (09:26 -0800)]
Fix Javadoc for StrictMode#permitUnbufferdIo
Bug:
35813076
Test: no tests
Change-Id: I2f71cad7a7a3f85908b322e2b83ba265c49adbad
Tyler Gunn [Wed, 1 Mar 2017 16:51:27 +0000 (16:51 +0000)]
resolve merge conflicts of
81a28efd1b16 to stage-aosp-master
am:
b455f0deed
Change-Id: Idca0886e3d6e4f1a5eaeeec98e6c7ed46985a29f
Tyler Gunn [Wed, 1 Mar 2017 16:44:32 +0000 (08:44 -0800)]
resolve merge conflicts of
81a28efd1b16 to stage-aosp-master
Change-Id: Ic4c1ca055db8e70db49d9fc91dfc705da6136a5d
Tyler Gunn [Wed, 1 Mar 2017 16:08:39 +0000 (16:08 +0000)]
Merge "Support confirmation of international calls while on WFC only."
Etan Cohen [Tue, 21 Feb 2017 18:08:42 +0000 (10:08 -0800)]
[AWARE] Add data-path security configuration (PMK)
Add API to optionally provide a pairwise master key (PMK)
to configure security on a data-path.
Clarify the default API to mean open (unencrypted) data-path.
Bug:
33552694
Test: unit tests and integration (sl4a) tests
Change-Id: I43fe704547f2921b3207f215e42d253837aa04e9
Nathan Harold [Wed, 1 Mar 2017 14:17:46 +0000 (14:17 +0000)]
Merge "Add API Surface for creating IpSec Transforms" am:
7645fa2816
am:
0a6305d5dd
Change-Id: Ie1798e4d7dda91a970db40e078016fcbcf89149f
Nathan Harold [Wed, 1 Mar 2017 14:12:55 +0000 (14:12 +0000)]
Merge "Add API Surface for creating IpSec Transforms"
am:
7645fa2816
Change-Id: Ibe70a60c5c5808a7877145cccefcc1f11bfacc51
Treehugger Robot [Wed, 1 Mar 2017 14:05:47 +0000 (14:05 +0000)]
Merge "Add API Surface for creating IpSec Transforms"
Erik Kline [Wed, 1 Mar 2017 11:50:41 +0000 (11:50 +0000)]
Merge "Fix dead lock in Tethering state machine" am:
355dbae680
am:
0703f03953
Change-Id: I233d796cf67a71ebc43970f949930de46a0ddb3f
Erik Kline [Wed, 1 Mar 2017 11:46:10 +0000 (11:46 +0000)]
Merge "Fix dead lock in Tethering state machine"
am:
355dbae680
Change-Id: Idd08726f3eeebba49a9ad909464377af67600d30
Erik Kline [Wed, 1 Mar 2017 11:40:02 +0000 (11:40 +0000)]
Merge "Fix dead lock in Tethering state machine"
Erik Kline [Wed, 1 Mar 2017 11:08:06 +0000 (11:08 +0000)]
Merge "Also test for additional NetworkCallback calls" am:
dff6c5c30d
am:
47d8385184
Change-Id: I19ff91b1397abe20920bbae8aa6c976c6bcac0ba
Erik Kline [Wed, 1 Mar 2017 11:03:08 +0000 (11:03 +0000)]
Merge "Also test for additional NetworkCallback calls"
am:
dff6c5c30d
Change-Id: I00b3f7be06bde167872d0cdefe940cda5e138846
Treehugger Robot [Wed, 1 Mar 2017 10:55:34 +0000 (10:55 +0000)]
Merge "Also test for additional NetworkCallback calls"
Erik Kline [Tue, 28 Feb 2017 07:20:20 +0000 (16:20 +0900)]
Also test for additional NetworkCallback calls
Specifcally:
- onCapabilitiesChanged
- onLinkPropertiesChanged
- onNetworkSuspended
Test: as follows
- built (bullhead)
- flashed
- booted
- runtest frameworks-net passes
Bug:
32163131
Change-Id: Ie0f7c8ac21313b11980bb335c89ecde6fd8e311c
Nathan Harold [Fri, 13 Jan 2017 02:38:57 +0000 (18:38 -0800)]
Add API Surface for creating IpSec Transforms
This CL adds an API to set up an IPSec Security Association
and Security Policy to perform Transport-Mode and Tunnel-Mode encapuslation
of IP Packets.
Bug:
30984788
Bug:
34811752
Test:
34812052,
34811227
Change-Id: Ic9f63c7bb366302a24baa3e1b79020210910ac0a
Yifan Hong [Wed, 1 Mar 2017 00:05:48 +0000 (16:05 -0800)]
getTransport checks interface and instance names.
Bug:
35219444
Test: hidl_test
Test: camera, soundtrigger works on marlin
Test: video playback works on marlin
Change-Id: I4d714d2576588cbd9a30d9687e992d34ee0db6d4
George Burgess IV [Wed, 1 Mar 2017 01:58:36 +0000 (01:58 +0000)]
Merge "Fix memory-leak warnings from the static analyzer" am:
2006bfc9ad
am:
43fd84a03c
Change-Id: Id2b577a021a3163d9f489235bf7f76c5f5ae527e
George Burgess IV [Wed, 1 Mar 2017 01:53:27 +0000 (01:53 +0000)]
Merge "Fix memory-leak warnings from the static analyzer"
am:
2006bfc9ad
Change-Id: I2efd6e42c72d3163505a23e8a95e45526a5ef642
Treehugger Robot [Wed, 1 Mar 2017 01:45:51 +0000 (01:45 +0000)]
Merge "Fix memory-leak warnings from the static analyzer"
Hall Liu [Wed, 1 Mar 2017 01:05:58 +0000 (01:05 +0000)]
Merge "Add @hide to RttAudioMode IntDef" am:
22af0f3377
am:
c284379659
Change-Id: I892dd9f7c070aade5962b53277a860a55ed237ea
Hall Liu [Wed, 1 Mar 2017 01:01:29 +0000 (01:01 +0000)]
Merge "Add @hide to RttAudioMode IntDef"
am:
22af0f3377
Change-Id: Ifdfdf7ced2f88188314475c99dd58cdf886f014d
OSDN Git Service
