OSDN Git Service
Yohann Roussel [Wed, 31 Jan 2018 10:42:57 +0000 (10:42 +0000)]
Merge "Add tests about MultiDex corruption recovering" am:
01e426d158
am:
b319cca253
Change-Id: Ic754f70aa3c2d1202686e6ff80fc80e7040bb40d
Jack Yu [Wed, 31 Jan 2018 10:35:49 +0000 (10:35 +0000)]
Merge "Used the better hash method provided by Objects" am:
262f84699e
am:
e9642cdb50
Change-Id: I843b74fae7c6c8b937236755793d6739600e7643
Yohann Roussel [Wed, 31 Jan 2018 10:35:14 +0000 (10:35 +0000)]
Merge "Add tests about MultiDex corruption recovering"
am:
01e426d158
Change-Id: I5c146f98e327b12bf9d3de2fbe98914aead74d03
Jack Yu [Wed, 31 Jan 2018 10:28:23 +0000 (10:28 +0000)]
Merge "Used the better hash method provided by Objects"
am:
262f84699e
Change-Id: I05df9cf2588ff7953419747fb3a5458ed7bcb6d3
Yohann Roussel [Wed, 31 Jan 2018 09:57:44 +0000 (09:57 +0000)]
Merge "Add tests about MultiDex corruption recovering"
Treehugger Robot [Wed, 31 Jan 2018 09:04:52 +0000 (09:04 +0000)]
Merge "Used the better hash method provided by Objects"
Svetoslav Ganov [Wed, 31 Jan 2018 02:07:53 +0000 (02:07 +0000)]
Merge "Use correct user id for permission check for instant foreground service" into oc-mr1-dev
am:
0640facdc3
Change-Id: I9b3ebd42c7c5fc59f5c1332ea14d28ff3c8f14ca
nharold [Wed, 31 Jan 2018 01:59:39 +0000 (01:59 +0000)]
Merge "Remove getIsimChallengeResponse" am:
b6d5a85a9c
am:
c13ddc2fe0
Change-Id: If67d532c0ab0cbd778650cd2a6bd33b91f0459e5
Svetoslav Ganov [Wed, 31 Jan 2018 01:55:49 +0000 (01:55 +0000)]
Merge "Use correct user id for permission check for instant foreground service" into oc-mr1-dev
nharold [Wed, 31 Jan 2018 01:53:06 +0000 (01:53 +0000)]
Merge "Remove getIsimChallengeResponse"
am:
b6d5a85a9c
Change-Id: Ibe1fa0df045b41392fd23e5985085b8168fa59ba
nharold [Wed, 31 Jan 2018 00:23:50 +0000 (00:23 +0000)]
Merge "Remove getIsimChallengeResponse"
Holly Jiuyu Sun [Wed, 31 Jan 2018 00:18:23 +0000 (00:18 +0000)]
Merge "Only allow LPA to select ISD-R using iccTransmitApduBasicChannel" am:
04e5e63305
am:
8b37eedfc9
Change-Id: I5ed1d2622cac57b527eb13ff752be44f606a1dc1
Nathan Harold [Wed, 31 Jan 2018 00:12:08 +0000 (00:12 +0000)]
Merge "Update Docstring for SmsMessage.getOriginatingAddress" am:
14513e0ea3
am:
79f3dcb694
Change-Id: I4b3369fb2a75234e9100630cc7a2ebf49855d722
Holly Jiuyu Sun [Wed, 31 Jan 2018 00:08:19 +0000 (00:08 +0000)]
Merge "Only allow LPA to select ISD-R using iccTransmitApduBasicChannel"
am:
04e5e63305
Change-Id: I90c12c640d8583edf97f3c44a03d5f4a63c0df20
Nathan Harold [Wed, 31 Jan 2018 00:04:27 +0000 (00:04 +0000)]
Merge "Update Docstring for SmsMessage.getOriginatingAddress"
am:
14513e0ea3
Change-Id: I46ee8b9534b695de8ad2263c4cc9a7d35165f1ad
Holly Jiuyu Sun [Tue, 30 Jan 2018 23:05:00 +0000 (23:05 +0000)]
Merge "Only allow LPA to select ISD-R using iccTransmitApduBasicChannel"
Alex Light [Tue, 30 Jan 2018 21:53:34 +0000 (21:53 +0000)]
Merge "Make AndroidRuntime only start the debugger for zygote forked apps." am:
5cdf28f38b
am:
710b7c6626
Change-Id: I76a047647aaae7b50d62292ba04bd93350ba234c
nharold [Tue, 30 Jan 2018 21:44:40 +0000 (21:44 +0000)]
Merge "Update hashCode in CellSignalStrength classes" am:
59fec059a9
am:
f148ec8b72
Change-Id: I2038a5395a0917d13080d204f429c8847006edc5
Alex Light [Tue, 30 Jan 2018 21:39:32 +0000 (21:39 +0000)]
Merge "Make AndroidRuntime only start the debugger for zygote forked apps."
am:
5cdf28f38b
Change-Id: I49026c8f5b79c2a872e206fe197b4ba4c7de255e
nharold [Tue, 30 Jan 2018 21:35:26 +0000 (21:35 +0000)]
Merge "Update hashCode in CellSignalStrength classes"
am:
59fec059a9
Change-Id: I1c00ea5351b86a4554b8276b01d9439e0a362d9a
Treehugger Robot [Tue, 30 Jan 2018 20:09:00 +0000 (20:09 +0000)]
Merge "Update Docstring for SmsMessage.getOriginatingAddress"
Mikael Magnusson [Tue, 30 Jan 2018 20:06:19 +0000 (20:06 +0000)]
Merge "Prevent ArrayIndexOutOfBoundsException for some invalid sysui_nav_bar values" am:
af5b90ff45
am:
e01fe74110
Change-Id: I24ac819e4d9edd59c7e4dac5ee5dea8ed4fc0148
Jack Yu [Tue, 30 Jan 2018 20:02:27 +0000 (12:02 -0800)]
Used the better hash method provided by Objects
Test: Unit tests
Bug:
64132030
Change-Id: Ib0fa616b28df97caf5457fd9069fbd76a80b17cc
Alex Light [Tue, 30 Jan 2018 19:55:28 +0000 (19:55 +0000)]
Merge "Make AndroidRuntime only start the debugger for zygote forked apps."
nharold [Tue, 30 Jan 2018 19:52:36 +0000 (19:52 +0000)]
Merge "Update hashCode in CellSignalStrength classes"
nharold [Tue, 30 Jan 2018 19:52:22 +0000 (19:52 +0000)]
Merge changes from topic "cherry-pick-cell-keepalive" am:
8cabb012fa
am:
02fecd46de
Change-Id: Ib4ba3f739a91ea2700611732f71afec0cc997ae4
Mikael Magnusson [Tue, 30 Jan 2018 19:52:21 +0000 (19:52 +0000)]
Merge "Prevent ArrayIndexOutOfBoundsException for some invalid sysui_nav_bar values"
am:
af5b90ff45
Change-Id: Ie80bb69b0208dab1e00da76cb60275151a6a5bc7
Tyler Gunn [Tue, 30 Jan 2018 19:43:52 +0000 (19:43 +0000)]
Merge "Add handover permission, fill in some missing API gaps." am:
1dfa830bb0
am:
ed4dd9fbc6
Change-Id: I2f04ac80df28e45d1bb9f8e55b45317752d61bd6
nharold [Tue, 30 Jan 2018 19:41:53 +0000 (19:41 +0000)]
Merge changes from topic "cherry-pick-cell-keepalive"
am:
8cabb012fa
Change-Id: I3001cd2693b2c57643672fd7f370b5cca2890585
Tyler Gunn [Tue, 30 Jan 2018 19:32:32 +0000 (19:32 +0000)]
Merge "Add handover permission, fill in some missing API gaps."
am:
1dfa830bb0
Change-Id: Ie07c7031c1411b59bbcd250be9517eda51b58310
Treehugger Robot [Tue, 30 Jan 2018 19:11:36 +0000 (19:11 +0000)]
Merge "Prevent ArrayIndexOutOfBoundsException for some invalid sysui_nav_bar values"
Primiano Tucci [Tue, 30 Jan 2018 18:47:23 +0000 (18:47 +0000)]
Merge "DropboxManager: Add err message if passing an invalid fd to addFile()" am:
90529d212a
am:
13d6ac4a35
Change-Id: I2ef468422d41228ce5b10028b4f8da4e3c5d23ce
nharold [Tue, 30 Jan 2018 18:39:07 +0000 (18:39 +0000)]
Merge changes from topic "cherry-pick-cell-keepalive"
* changes:
Rework KeepalivePacketData for Compatibility with Cell
Add Constants for NATT Keepalive to RILConstants
Relocate KeepalivePacketData to frameworks/base
Primiano Tucci [Tue, 30 Jan 2018 18:38:41 +0000 (18:38 +0000)]
Merge "DropboxManager: Add err message if passing an invalid fd to addFile()"
am:
90529d212a
Change-Id: I81362fcea24b7bf160854c972500f3e63b032330
Treehugger Robot [Tue, 30 Jan 2018 18:33:27 +0000 (18:33 +0000)]
Merge "Add handover permission, fill in some missing API gaps."
Treehugger Robot [Tue, 30 Jan 2018 16:16:34 +0000 (16:16 +0000)]
Merge "DropboxManager: Add err message if passing an invalid fd to addFile()"
Paul Duffin [Tue, 30 Jan 2018 16:07:53 +0000 (16:07 +0000)]
Merge changes Ied54c246,I0ea83bc8,Ibd8cb61d am:
88d9ddd386
am:
0ad9dfaef9
Change-Id: If92f07726dbdfdbcc64dac804a9993098f86ee84
Paul Duffin [Tue, 30 Jan 2018 15:59:40 +0000 (15:59 +0000)]
Merge changes Ied54c246,I0ea83bc8,Ibd8cb61d
am:
88d9ddd386
Change-Id: I1fd42187c55b80e60f2eac0af278bdecf806fccf
Paul Duffin [Tue, 30 Jan 2018 15:46:21 +0000 (15:46 +0000)]
Merge changes I59bd6ec5,I48864d48,I9b46a4e2,I09a70f3e am:
ba81a4d2a9
am:
a04964babf
Change-Id: I72471e141ad267c613526171af2166ecb96fb11d
Paul Duffin [Tue, 30 Jan 2018 15:38:36 +0000 (15:38 +0000)]
Merge changes I59bd6ec5,I48864d48,I9b46a4e2,I09a70f3e
am:
ba81a4d2a9
Change-Id: I8656226d30cb88df36c911b3da73674ee3d87130
Treehugger Robot [Tue, 30 Jan 2018 14:54:25 +0000 (14:54 +0000)]
Merge changes Ied54c246,I0ea83bc8,Ibd8cb61d
* changes:
Create test-legacy/ for android.test.legacy target
Add android.test.legacy.jar to SDK build
Add android.test.legacy target
Treehugger Robot [Tue, 30 Jan 2018 14:22:00 +0000 (14:22 +0000)]
Merge changes I59bd6ec5,I48864d48,I9b46a4e2,I09a70f3e
* changes:
Build test-runner/tests
Use prebuilt android.test. stubs jars for app builds
Build stubs against SDK and clear local variables
Use prebuilt android.test.base.jar for app builds
Paul Duffin [Tue, 30 Jan 2018 13:01:30 +0000 (13:01 +0000)]
Create test-legacy/ for android.test.legacy target
The android.test.legacy (and legacy-android-test) target depends on
code from both test-base/ and test-runner/ and do not really belong
in either folder.
Having a separate folder will also provide a convenient place for
the artifacts needed to publish android.test.legacy to
maven.google.com.
Bug:
30188076
Test: make checkbuild
Change-Id: Ied54c24694b3167fcf9075a3157e92ec53b8f636
Paul Duffin [Mon, 11 Dec 2017 15:13:08 +0000 (15:13 +0000)]
Build test-runner/tests
Previous change
e254526f0fe5d22681555bd4a00b7ee96fee1dc1 inadvertently
removed the line to include the tests/Android.mk file.
(cherry picked from commit
006b7a2b760b89211b9530804118a8333cee314b)
Bug:
30188076
Test: make checkbuild
Change-Id: I59bd6ec5d317eb6306642974902e4c061e594aa8
Merged-In: Ia0ba14a70d2232d464420265a7a5f9c4dde3661b
Paul Duffin [Fri, 26 Jan 2018 15:10:36 +0000 (15:10 +0000)]
Add android.test.legacy.jar to SDK build
This is needed in order to create a prebuilts version of this JAR that
can be used for unbundled builds.
Bug:
30188076
Test: wait for pi-release build and check
(cherry picked from commit
af06ed42b5316a12b0c37d4296cc86cb112d0021)
Change-Id: I0ea83bc88b6107f4154a9ca02f13b7c8cb367fea
Paul Duffin [Tue, 7 Nov 2017 07:33:11 +0000 (07:33 +0000)]
Use prebuilt android.test. stubs jars for app builds
(cherry picked from commit
e144602d9c94d46b2da11d70f526d747b5e05750)
Bug:
30188076
Test: tapas Launcher3
Change-Id: I48864d48098cfa02e15a6eaf8e4d6b53afc5b56c
Merged-In: If632c39c9d98d89d597d410ebc7973903c9fa91e
Paul Duffin [Fri, 5 Jan 2018 15:11:18 +0000 (15:11 +0000)]
Add android.test.legacy target
Adds a library that builds against the public API and so can be safely
statically included into applications to avoid them having to depend
on the android.test.base and android.test.runner runtime libraries.
(cherry picked from commit
a70f66cb5e40105d4b0ec535f011eea83a38c86a)
Bug:
30188076
Test: make checkbuild
Change-Id: Ibd8cb61d00a65dbcf630672706323e42d82e6ba2
Merged-In: Iae7e3c64392e11035322092ed8e194740ba2d321
Paul Duffin [Fri, 30 Jun 2017 15:02:09 +0000 (16:02 +0100)]
Build stubs against SDK and clear local variables
The stubs need to be built against the current SDK where possible and
not the internal modules.
(cherry picked from commit
d41d847c83c598082a6572f38d0d40f5dee427ef)
Bug:
30188076
Test: delete stub files and remake targets
Change-Id: I9b46a4e2be341fed7e5b33bbf1a80d88c5486ae6
Merged-In: Id724c16e56d1e8fe7f61cfafe7f11ea27e01e659
Paul Duffin [Wed, 6 Dec 2017 12:43:28 +0000 (12:43 +0000)]
Use prebuilt android.test.base.jar for app builds
(cherry picked from commit
1f090a8d66126a936e40f0e872c5fe5b655fa335)
Bug:
30188076
Test: make checkbuild
Change-Id: I09a70f3e79d0935394332870613b96c653af5e85
Merged-In: I1d7e705baf5728e7a034f3bd32746de3a1d3cd78
Bowgo Tsai [Tue, 30 Jan 2018 10:33:40 +0000 (10:33 +0000)]
Merge "Add odm sepolicy support to SELinuxMMAC.java" am:
4db2d4690e
am:
665737f124
Change-Id: I0ba64f18d1a1618b370f9df617a2638de5a1d30e
Bowgo Tsai [Tue, 30 Jan 2018 10:25:39 +0000 (10:25 +0000)]
Merge "Add odm sepolicy support to SELinuxMMAC.java"
am:
4db2d4690e
Change-Id: I7b631518df8812e7599bfffa197e814d5df66717
Treehugger Robot [Tue, 30 Jan 2018 08:11:53 +0000 (08:11 +0000)]
Merge "Add odm sepolicy support to SELinuxMMAC.java"
Dan Willemsen [Tue, 30 Jan 2018 04:19:00 +0000 (04:19 +0000)]
Merge "Remove undefined all-aidl-files-under" am:
ab5ac7814b
am:
f21b16123a
Change-Id: Ic8ba6444a7b839d6f83fb54e98b0dcf73afca089
Dan Willemsen [Tue, 30 Jan 2018 04:11:18 +0000 (04:11 +0000)]
Merge "Remove undefined all-aidl-files-under"
am:
ab5ac7814b
Change-Id: I97c3229c1d82494219ec17a23c1f094a3a27e5ae
Treehugger Robot [Tue, 30 Jan 2018 03:22:21 +0000 (03:22 +0000)]
Merge "Remove undefined all-aidl-files-under"
Nathan Harold [Mon, 29 Jan 2018 19:36:03 +0000 (11:36 -0800)]
Update Docstring for SmsMessage.getOriginatingAddress
There was a public request for clarification on the address
format for getOriginatingAddress. I did a little research and
have added the answer to the docstring.
Bug:
64697463
Test: compilation
Merged-In: Icf37af0a5940a6fb7798d7c7cafe7b97683bb689
Change-Id: Icf37af0a5940a6fb7798d7c7cafe7b97683bb689
Nathan Harold [Tue, 30 Jan 2018 01:17:10 +0000 (17:17 -0800)]
Update hashCode in CellSignalStrength classes
The CellSignalStrength hashCode function was using a
fairly ineffective method of hashing. An External
reporter requested that we fix it. This CL moves to
using the Objects.hash() implementation.
Bug:
22479413
Test: compilation
Change-Id: Ic017ba54ef757fd3ec3e5000ac61108dd836bd8a
Hugo Benichi [Tue, 30 Jan 2018 01:47:07 +0000 (01:47 +0000)]
Merge changes I303d1102,I72c9aa43,If13a5284 am:
cf5841db8d
am:
5aebce7466
Change-Id: Ida5f28fc0e8e99199ac7129a6e3df0fbe864d90b
Hugo Benichi [Tue, 30 Jan 2018 01:41:23 +0000 (01:41 +0000)]
Merge changes I303d1102,I72c9aa43,If13a5284
am:
cf5841db8d
Change-Id: I402de7fe5fc0e9bf56dc42f4c956c511baee78ab
Dan Willemsen [Tue, 30 Jan 2018 00:39:27 +0000 (16:39 -0800)]
Remove undefined all-aidl-files-under
This is not a defined function, and there are no aidl files under these
directories anyways.
Bug:
72661763
Test: find location/lib -name '*.aidl'
Test: find media/lib -name '*.aidl'
Change-Id: I000d8febd54a50d4c07b910fa374ac8019f696be
Holly Jiuyu Sun [Tue, 30 Jan 2018 00:28:21 +0000 (00:28 +0000)]
Merge "Remove SystemApi annotation from EuiccManager.getOtaStatus()" am:
67fb5370cd
am:
bded9f969f
Change-Id: I704a78ae7330d1eefcfcecb6dfb8073d71cfe5ed
Hugo Benichi [Tue, 30 Jan 2018 00:26:31 +0000 (00:26 +0000)]
Merge changes I303d1102,I72c9aa43,If13a5284
* changes:
Fix default network validation overcounting
Prevent crash in NetworkManagementServiceTest#shutdown()
Fix ApfTest
Holly Jiuyu Sun [Tue, 30 Jan 2018 00:20:46 +0000 (00:20 +0000)]
Merge "Remove SystemApi annotation from EuiccManager.getOtaStatus()"
am:
67fb5370cd
Change-Id: I784ea684fa99ef0dc6ed56ddff966669fbaddd49
Alex Light [Mon, 29 Jan 2018 22:27:38 +0000 (14:27 -0800)]
Make AndroidRuntime only start the debugger for zygote forked apps.
This got changed unintentionally in commit
fffb273. Restore the
original behavior where JDWP will not be enabled for non-zygote apps.
Bug:
72400560
Test: atest CtsJdwpSecurityHostTestCases
Change-Id: I364a9d8b6e87efc1604741a7e5dd68221ed8e491
Holly Jiuyu Sun [Mon, 29 Jan 2018 23:47:11 +0000 (23:47 +0000)]
Merge "Remove SystemApi annotation from EuiccManager.getOtaStatus()"
Nathan Harold [Mon, 29 Jan 2018 21:30:58 +0000 (13:30 -0800)]
Remove getIsimChallengeResponse
Remove the obsolete getIsimChallengeResponse.
Anybody calling this method should use
getIccSimChallengeResponse instead.
Bug:
27954896
Test: compilation
Change-Id: I636825a448992e06dc11d4cd58dee750c38b2c5e
Jon Dormody [Mon, 29 Jan 2018 21:15:04 +0000 (21:15 +0000)]
Merge "Docs: Changed "the value of an item that previously added with putExtra()" to "the value of an item previously added with putExtra(),"" into oc-mr1-dev
am:
0704571547
Change-Id: Ib9702cb1707ba756ea3202e0fdde579f5c493866
Jiyong Park [Mon, 8 Jan 2018 05:08:17 +0000 (14:08 +0900)]
Remove SystemApi annotation from EuiccManager.getOtaStatus()
EuiccManager.getOtaStatus() has been annotated as @SystemApi, but its
declaring class EuiccManager has not. Therefore, the method hasn't been
recognized as SystemApi (does not appear in system-current.txt) and no
app is using the method.
This hasn't been harmful, but will soon trigger CTS failures when we do
the exact match for SystemAPIs; a runtime entity annotated as @SystemApi
have to exist in the documented API (e.g. system-current.txt). So
removing this no-op annotation.
Bug:
67891551
Test: m -j checkapi
Change-Id: I570ef5e5c88b6b9162116d3d3a7b17367efa9d7f
Jon Dormody [Mon, 29 Jan 2018 21:04:50 +0000 (21:04 +0000)]
Merge "Docs: Changed "the value of an item that previously added with putExtra()" to "the value of an item previously added with putExtra(),"" into oc-mr1-dev
Jon Dormody [Mon, 29 Jan 2018 19:40:10 +0000 (19:40 +0000)]
Merge "Docs: Inserting a line to include the documentation for keyPreviewHeight." into oc-mr1-dev
am:
7b3c924114
Change-Id: I8a010a0b326f58a5c3e1d0b86f4990123cd67307
Jon Dormody [Mon, 29 Jan 2018 19:34:59 +0000 (19:34 +0000)]
Merge "Docs: Added a link to the Motion Sensor docs for information on gravity values and calculating alpha. Test: make ds-docs Bug:
6442659" into oc-mr1-dev
am:
04d261f309
Change-Id: I15d0773c820591f153c67382b8826131eb88f98a
Jon Dormody [Mon, 29 Jan 2018 19:23:32 +0000 (19:23 +0000)]
Merge "Docs: Inserting a line to include the documentation for keyPreviewHeight." into oc-mr1-dev
Jon Dormody [Mon, 29 Jan 2018 19:23:15 +0000 (19:23 +0000)]
Merge "Docs: Added a link to the Motion Sensor docs for information on gravity values and calculating alpha. Test: make ds-docs Bug:
6442659" into oc-mr1-dev
Nathan Harold [Thu, 7 Dec 2017 03:07:32 +0000 (19:07 -0800)]
Rework KeepalivePacketData for Compatibility with Cell
KeepalivePacketData currently mixes multiple concepts: the
list of parameters that are used to generate a keepalive
packet, the keepalive packet itself, and the parameters that
are needed to send a keepalive packet over an ethernet link.
The KeepalivePacketData is now a parcelable that can be used
generically by any NetworkAgent, regardless of how that Agent
fulfills its duty to initiate and maintain a keepalive session.
Bug:
69063212
Test: verified with SL4A, additional tests pending
Merged-In: I23dc4827ae729583356a8ff0f02e39a2ad2b81f5
Change-Id: I23dc4827ae729583356a8ff0f02e39a2ad2b81f5
(cherry picked from commit
26deacfbe7eb1730aea9eeb03fa265af2ce90cad)
Nathan Harold [Tue, 11 Jul 2017 23:25:16 +0000 (16:25 -0700)]
Add Constants for NATT Keepalive to RILConstants
Bug:
38350389
Test: compilation
Merged-In: Ic18a7c947d2c62efe76d656bd683f9ce296f68fd
Change-Id: Ic18a7c947d2c62efe76d656bd683f9ce296f68fd
(cherry picked from commit
974aada04734ced17f3842c817e7e8c3528d0739)
Nathan Harold [Fri, 3 Nov 2017 04:01:46 +0000 (21:01 -0700)]
Relocate KeepalivePacketData to frameworks/base
Due to an issue resolving the boot classpath, the
KeepalivePacketData structure cannot be referenced
by frameworks/opt/telephony while it is in services.
-Move KeepalivePacketData to android.net
-Also, relocate IpUtils without changing the package
name.
Bug:
38350389
Test: compilation
Merged-In: If5fc63e9ad8b9b2d4c2fee47ff4bab2ab190a05a
Change-Id: If5fc63e9ad8b9b2d4c2fee47ff4bab2ab190a05a
(cherry picked from commit
41002e3080461ba6a7aee12c1d12dd13edc8626c)
Ruchi Kandoi [Mon, 29 Jan 2018 18:25:10 +0000 (18:25 +0000)]
Merge "Add android.Manifest.permission.NFC_TRANSACTION_EVENT" am:
ac2247c406
am:
626f665a65
Change-Id: I562b46b71416406e2640fc84f7b6a064327a7ca8
Ruchi Kandoi [Mon, 29 Jan 2018 18:18:11 +0000 (18:18 +0000)]
Merge "Add android.Manifest.permission.NFC_TRANSACTION_EVENT"
am:
ac2247c406
Change-Id: I6592686f765e3474d1c02bf9b3bc243ab152b641
Treehugger Robot [Mon, 29 Jan 2018 17:59:23 +0000 (17:59 +0000)]
Merge "Add android.Manifest.permission.NFC_TRANSACTION_EVENT"
Mikael Magnusson [Mon, 29 Jan 2018 16:56:10 +0000 (17:56 +0100)]
Prevent ArrayIndexOutOfBoundsException for some invalid sysui_nav_bar values
A user can change sysui_nav_bar via adb.
If value of sysui_nav_bar doesn't contain two semicolons, split String array
is accessed out of bounds throwing an exception, sending SystemUI
in an exception loop.
Test: manual
Test: adb exec-out settings put secure sysui_nav_bar "home;back"
Change-Id: Ia9d74be36d287085650393476029489c9a359a0f
Ricardo Loo Foronda [Mon, 29 Jan 2018 17:12:00 +0000 (17:12 +0000)]
Docs: Removed rogue "(TODO)" note in FLAG_SHOW_LIGHTS member
am:
f8f6d0a8ec
Change-Id: I8aabec3ac04c0a732efe705919f53a3cadd8c63a
Jason Monk [Mon, 29 Jan 2018 16:06:51 +0000 (16:06 +0000)]
Merge "Fix nav keys being tiny on sw600dp devices" am:
a20239bf71
am:
38cbc885d1
Change-Id: I3ebdf0ad481dcf9e6ec2d12151d591a24c40458a
David Brazdil [Mon, 29 Jan 2018 15:59:49 +0000 (15:59 +0000)]
Merge "Control hidden API toast with a system property" am:
13020490be
am:
a9b3f91828
Change-Id: Iac1fdeff968b131e8f3486060dfb7cdeed446157
Jason Monk [Mon, 29 Jan 2018 15:56:06 +0000 (15:56 +0000)]
Merge "Fix nav keys being tiny on sw600dp devices"
am:
a20239bf71
Change-Id: I30fbb071d290ff8477560f25216dd1ea04c789a6
David Brazdil [Mon, 29 Jan 2018 15:52:46 +0000 (15:52 +0000)]
Merge "Control hidden API toast with a system property"
am:
13020490be
Change-Id: Ib390fd568e4a5d71cdceec3a84b0d55e02b9c45d
Treehugger Robot [Mon, 29 Jan 2018 14:55:21 +0000 (14:55 +0000)]
Merge "Fix nav keys being tiny on sw600dp devices"
David Brazdil [Mon, 29 Jan 2018 14:46:06 +0000 (14:46 +0000)]
Merge "Control hidden API toast with a system property"
David Brazdil [Fri, 26 Jan 2018 12:23:15 +0000 (12:23 +0000)]
Control hidden API toast with a system property
CL Id0a4200f912ac3303026cb26b6d8974c47332828 sets a system property
"ro.art.hiddenapi.warning" for non-release, non-user builds. This
patch reads that flag and unless the flag is set, will only ever show
the warning message if the app is debuggable.
Test: manual
Bug:
64382372
Change-Id: I9b552792779589a7a91818a82d5c86141fc0a30b
Hugo Benichi [Thu, 14 Dec 2017 00:56:04 +0000 (09:56 +0900)]
Fix default network validation overcounting
When switching from a validated default network to a new validated
default network (typically because of a better score),
DefaultNetworkMetrics would not reset the last validation timestamp.
This would cause the new default network to have a total recorded
validation time overcounted by the validation time of the previous
default network.
The following fix should be applied downstream for consumers of
previously recorded data:
validation_time = min validation_time, duration_time);
Test: runtest -x frameworks/base/tests/net/../IpConnectivityMetricsTest
Change-Id: I303d11023527c19435f5f5e796a0295ae3f76d9f
Hugo Benichi [Mon, 29 Jan 2018 05:00:44 +0000 (14:00 +0900)]
Prevent crash in NetworkManagementServiceTest#shutdown()
The shutdown method in NetworkManagementServiceTest was trying to close
the local socket on the test side, causing the NativeDaemonConnector
internal to NetworkManagementService to sometime crash due to the
output stream on NetworkManagementService side to throw on pending
reads.
The correct fix would be to shutdown the NativeDaemonConnector
inside NetworkManagementService and implement NetworkManagementService's
shutdown method, however there is no way to cleanly close a
NativeDaemonConnector.
Instead, this patch doesn't do any cleanup of the listening socket, the
test local socket, and its output stream. These objects' resources get
eventually collected by the system when the test process exits.
Test: runtest frameworks-net
Change-Id: I72c9aa43403754b55e9d23bf4f3ba8b7b4a3e10a
Hugo Benichi [Mon, 29 Jan 2018 04:16:12 +0000 (13:16 +0900)]
Fix ApfTest
By adding missing so file to Android.mk.
Test: runtest -x frameworks/base/tests/net/java/android/net/apf/ApfTest.java
Change-Id: If13a52845e0cc70a27ca6eeb976a14f91c7146ea
Ricardo Loo Foronda [Thu, 25 Jan 2018 16:42:43 +0000 (08:42 -0800)]
Docs: Removed rogue "(TODO)" note in FLAG_SHOW_LIGHTS member
Status: Ready for review
Note: This is a Javadoc only change.
Changes: Removed unnecessary "(TODO)" note.
Test: Build the docs with "make ds-docs" and staged updated content.
Staged content:
go/dac-stage/reference/android/app/Notification.html#FLAG_SHOW_LIGHTS
Bug:
20150478
Change-Id: I3a7fc0414ccb6f52e9b4919031a93ca1a7a29336
Ricardo Loo Foronda [Mon, 29 Jan 2018 04:11:43 +0000 (04:11 +0000)]
Merge "Docs: Fixed broken link to Traceview docs" into oc-mr1-dev
am:
16a77c54ef
Change-Id: Ifb88d7364a377092509bb9a93def65ccca7dcf41
Ricardo Loo Foronda [Mon, 29 Jan 2018 04:04:09 +0000 (04:04 +0000)]
Merge "Docs: Fixed broken link to Traceview docs" into oc-mr1-dev
Ricardo Loo Foronda [Mon, 29 Jan 2018 02:39:30 +0000 (02:39 +0000)]
Merge "docs: Added a missing "be" in ACTION_CONNECTION_STATE_CHANGED" into oc-mr1-dev
am:
1299d4b0a9
Change-Id: Ib2911651950048305b00df5f26ca5656e205bcee
Ricardo Loo Foronda [Mon, 29 Jan 2018 02:27:48 +0000 (02:27 +0000)]
Merge "docs: Added a missing "be" in ACTION_CONNECTION_STATE_CHANGED" into oc-mr1-dev
Bill Yi [Sun, 28 Jan 2018 06:56:41 +0000 (06:56 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
am:
a1b9eecab0 -s ours
Change-Id: Ibf30adce3835b1023b40b814fe5dfb46dfd04d06
TreeHugger Robot [Sun, 28 Jan 2018 06:49:19 +0000 (06:49 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
Bill Yi [Sat, 27 Jan 2018 17:39:47 +0000 (17:39 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
am:
ac3264742d -s ours
Change-Id: I7c30321b70de8f0f35057356b17673a15f6b2b09
TreeHugger Robot [Sat, 27 Jan 2018 17:32:17 +0000 (17:32 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev