OSDN Git Service
TreeHugger Robot [Tue, 5 Dec 2017 16:49:58 +0000 (16:49 +0000)]
Merge "WM: Adjust TaskSnapshot for cutout layout"
Abodunrinwa Toki [Tue, 5 Dec 2017 16:39:28 +0000 (16:39 +0000)]
Merge "Add a signature to TextSelection and TextClassification"
Jason Monk [Tue, 5 Dec 2017 16:11:32 +0000 (16:11 +0000)]
Merge "Add latency logging for rotation"
TreeHugger Robot [Tue, 5 Dec 2017 16:03:26 +0000 (16:03 +0000)]
Merge changes I2eef812b,I7b607192
* changes:
AAPT v1 embed compile SDK version and codename into app
AAPT2: Embed version of framework an app was compiled against.
Jorim Jaggi [Tue, 5 Dec 2017 15:41:12 +0000 (15:41 +0000)]
Merge "Make SurfaceControl parcelable (1/2)"
Adrian Roos [Wed, 29 Nov 2017 15:39:44 +0000 (16:39 +0100)]
WM: Adjust TaskSnapshot for cutout layout
Makes TaskSnapshot work even when the main window top-left
position is not the same as the stack's.
Bug:
65689439
Test: Enable cutout, open Gmail, open Recents, verify transition did not jump in the end, open Gmail from recents, verify transition did not jump in the end.
Change-Id: I48053f551ed1c118764aa30e0b6408db64d4a5f1
TreeHugger Robot [Tue, 5 Dec 2017 13:48:45 +0000 (13:48 +0000)]
Merge "Ensure non app WindowTokens are removed when closing."
Hugo Benichi [Tue, 5 Dec 2017 10:09:35 +0000 (10:09 +0000)]
Merge "Fix bug in MacAddress.fromString()" am:
cdb84d2fc7 am:
9d077ecd9d
am:
5d2bd6bf0c
Change-Id: I7df23a45618825b874658ccbbf1d1fda6b164954
Hugo Benichi [Tue, 5 Dec 2017 10:01:19 +0000 (10:01 +0000)]
Merge "Fix bug in MacAddress.fromString()" am:
cdb84d2fc7
am:
9d077ecd9d
Change-Id: If67d0b8fcc2270d4b152d4e07c79725b457574c6
Hugo Benichi [Tue, 5 Dec 2017 09:47:50 +0000 (09:47 +0000)]
Merge "Fix bug in MacAddress.fromString()"
am:
cdb84d2fc7
Change-Id: If4c85f0a5ea259f53f9cffa6eacb58fcde1fd1df
Neil Fuller [Tue, 5 Dec 2017 09:43:02 +0000 (09:43 +0000)]
Merge "Track API changes in libcore"
Treehugger Robot [Tue, 5 Dec 2017 09:38:42 +0000 (09:38 +0000)]
Merge "Fix bug in MacAddress.fromString()"
Colin Cross [Tue, 5 Dec 2017 05:52:02 +0000 (05:52 +0000)]
Merge "Don't use path to find protoc-gen-javastream" am:
1a2a45667b am:
1c578e8032
am:
b8e4d0e561
Change-Id: I4a9d4dfb15d958b28cf329c5ebc0009654345fbf
Colin Cross [Tue, 5 Dec 2017 05:42:40 +0000 (05:42 +0000)]
Merge "Don't use path to find protoc-gen-javastream" am:
1a2a45667b
am:
1c578e8032
Change-Id: I87059bcfa09597449aaef2e2141957ea7d181ce5
Colin Cross [Tue, 5 Dec 2017 05:33:47 +0000 (05:33 +0000)]
Merge "Don't use path to find protoc-gen-javastream"
am:
1a2a45667b
Change-Id: Idf4e12d812cf9108f8c3b22057e0bcbd90c14807
TreeHugger Robot [Tue, 5 Dec 2017 05:26:39 +0000 (05:26 +0000)]
Merge "Fix TextViewTest.testHyphenationWidth"
Treehugger Robot [Tue, 5 Dec 2017 05:22:25 +0000 (05:22 +0000)]
Merge "Don't use path to find protoc-gen-javastream"
Luke Nicholson [Tue, 5 Dec 2017 05:20:00 +0000 (05:20 +0000)]
Merge "Enable obfuscation of resource names, with whitelisting support."
Jeff Sharkey [Tue, 5 Dec 2017 05:00:46 +0000 (05:00 +0000)]
Merge "API for apps to tag sockets with their own UID."
TreeHugger Robot [Tue, 5 Dec 2017 04:34:09 +0000 (04:34 +0000)]
Merge "Switch to use audio usage instead of stream_type in Car Settings UI"
Hugo Benichi [Tue, 5 Dec 2017 04:14:08 +0000 (13:14 +0900)]
Fix bug in MacAddress.fromString()
Test: runtest frameworks-net
Bug:
69390696
Change-Id: I83f01e4915092e08ed201d9b6738bb02498d3bba
Andreas Gampe [Tue, 5 Dec 2017 02:57:35 +0000 (02:57 +0000)]
Merge "Frameworks: Silently ignore InterruptedException" am:
7e717e09cd am:
a6c6c4f5d3
am:
d52c7c9206
Change-Id: Ia6588f13809132b705d372ba132ed3f7ef179bad
TreeHugger Robot [Tue, 5 Dec 2017 02:51:51 +0000 (02:51 +0000)]
Merge "Sends resolving action to Instant App installer"
Hongwei Wang [Mon, 4 Dec 2017 20:40:49 +0000 (12:40 -0800)]
Switch to use audio usage instead of stream_type in Car Settings UI
This CL changes nothing but method name. A following CL should either
remove or refactor the CarVolumeDialogController class as we are moving
to use AudioAttributes usage instead of stream_type.
Bug:
28469751
Test: lunch bat_land-userdebug && m -j // Then flash and open the app
Change-Id: Ic3c657ed36d67fbbc18b6787b04bff147ee693a2
TreeHugger Robot [Tue, 5 Dec 2017 02:49:57 +0000 (02:49 +0000)]
Merge "Add Preferred Phone Account columns"
Android Build Merger (Role) [Tue, 5 Dec 2017 02:47:32 +0000 (02:47 +0000)]
Merge "Merge "Validate IpSecAlgorithm Length" am:
68b81299d2 am:
5e3d66e78b am:
7a8f0dc0c0"
TreeHugger Robot [Tue, 5 Dec 2017 02:46:37 +0000 (02:46 +0000)]
Merge "New Autofill API: let service set optional header and footer for dataset picker."
nharold [Tue, 5 Dec 2017 02:46:06 +0000 (02:46 +0000)]
Merge "Validate IpSecAlgorithm Length" am:
68b81299d2 am:
5e3d66e78b
am:
7a8f0dc0c0
Change-Id: I1a28d860ac7125afc1f82ac17d1834b0121c0e11
Andreas Gampe [Tue, 5 Dec 2017 02:43:53 +0000 (02:43 +0000)]
Merge "Frameworks: Silently ignore InterruptedException" am:
7e717e09cd
am:
a6c6c4f5d3
Change-Id: I737474738fa688d5bc651390409cbd792ffa7282
chaviw [Tue, 5 Dec 2017 02:39:34 +0000 (18:39 -0800)]
Ensure non app WindowTokens are removed when closing.
Non app WindowTokens weren't propery removed when closing. This
would cause several layers to stay around in the system.
Bug:
69852584
Test: Turn phone screen off and back on again. Window is removed.
Change-Id: I51674ebdab129b462e958c3027a26ee6feeffb9f
TreeHugger Robot [Tue, 5 Dec 2017 02:38:19 +0000 (02:38 +0000)]
Merge "AnomalyDetection invalidity depends on MetricProd"
nharold [Tue, 5 Dec 2017 02:37:14 +0000 (02:37 +0000)]
Merge "Validate IpSecAlgorithm Length" am:
68b81299d2
am:
5e3d66e78b
Change-Id: I1ffaa4de392777c5199a411aef9cd10f4e7c3666
Andreas Gampe [Tue, 5 Dec 2017 02:34:41 +0000 (02:34 +0000)]
Merge "Frameworks: Silently ignore InterruptedException"
am:
7e717e09cd
Change-Id: I75da071918e7fc2e547df4e4d75121806c730ca2
nharold [Tue, 5 Dec 2017 02:28:10 +0000 (02:28 +0000)]
Merge "Validate IpSecAlgorithm Length"
am:
68b81299d2
Change-Id: I23f7612c119e67f9a1647568aeefde38a365f8da
TreeHugger Robot [Tue, 5 Dec 2017 02:27:47 +0000 (02:27 +0000)]
Merge "Tiny fix to bug when statsd should clear data."
TreeHugger Robot [Tue, 5 Dec 2017 02:26:16 +0000 (02:26 +0000)]
Merge "libandroidfw: Remove pre-verification"
Treehugger Robot [Tue, 5 Dec 2017 02:25:14 +0000 (02:25 +0000)]
Merge "Frameworks: Silently ignore InterruptedException"
nharold [Tue, 5 Dec 2017 02:13:55 +0000 (02:13 +0000)]
Merge "Validate IpSecAlgorithm Length"
TreeHugger Robot [Tue, 5 Dec 2017 02:01:48 +0000 (02:01 +0000)]
Merge "Add DIRTY_RETAIN constant"
Luke Nicholson [Fri, 1 Dec 2017 23:29:03 +0000 (15:29 -0800)]
Enable obfuscation of resource names, with whitelisting support.
Test: Built aapt2, ran optimize on gmail apk with sample whitelist
config file, and flags enabled. Added two unit tests to TableFlattener
covering obfuscation logic.
Change-Id: Iad6329d75ff440121bf1a2cdf09c5f4bf4199d9d
Colin Cross [Tue, 5 Dec 2017 01:53:37 +0000 (01:53 +0000)]
Merge "Fix droiddoc when OUT_DIR is an absolute path" am:
85f095e246 am:
b42cfb691d
am:
4f11d4c526 -s ours
Change-Id: Ib8596dda23c9ad1fb85f76df5545796e8620bd01
Colin Cross [Tue, 5 Dec 2017 01:39:47 +0000 (01:39 +0000)]
Merge "Fix droiddoc when OUT_DIR is an absolute path" am:
85f095e246
am:
b42cfb691d
Change-Id: I8af7eee810e05ba6ba7d42cdddc6efee8963b141
Jeff Sharkey [Tue, 5 Dec 2017 01:38:22 +0000 (01:38 +0000)]
Merge "Match network roaming state to avoid wtf()." am:
3fb2711ede am:
bafba08c6b
am:
255cac2474
Change-Id: I04247a01f6a93001079429b1ee40f28afc877dcd
Alan Viverette [Thu, 9 Nov 2017 20:41:44 +0000 (15:41 -0500)]
AAPT v1 embed compile SDK version and codename into app
Also adds support for dumping compile SDK attributes.
Bug:
63388434
Fixes:
68854953
Test: manual, compiled & dumped ApiDemos APK
Change-Id: I2eef812bd957950cdef5f1257b73b57044a1e731
Colin Cross [Tue, 5 Dec 2017 01:29:12 +0000 (01:29 +0000)]
Merge "Fix droiddoc when OUT_DIR is an absolute path"
am:
85f095e246
Change-Id: I5a91ba906958777944fc25fb5de281e4c8beebe7
Jeff Sharkey [Tue, 5 Dec 2017 01:28:55 +0000 (01:28 +0000)]
Merge "Match network roaming state to avoid wtf()." am:
3fb2711ede
am:
bafba08c6b
Change-Id: I3dd62df8b9bb89936c1c722849bfa921bc8b3e6d
Adam Lesinski [Mon, 4 Dec 2017 21:46:23 +0000 (13:46 -0800)]
AAPT2: Embed version of framework an app was compiled against.
This change injects the 'android:compileSdkVersion' and
'android:compileSdkVersionCodename' into an app's AndroidManifest.xml,
whose values are dervied from the version name and version code of the
framework AndroidManifest.xml that is being linked against.
Bug:
63388434
Test: make aapt2_tests
Change-Id: I7b607192ecb337307c4bcb5770e7f716c6d4c9d2
TreeHugger Robot [Tue, 5 Dec 2017 01:17:47 +0000 (01:17 +0000)]
Merge "Revert "Smooth scroll RecyclerView on a11y ACTION_SCROLL_*""
Jeff Sharkey [Tue, 5 Dec 2017 01:11:53 +0000 (01:11 +0000)]
Merge "Match network roaming state to avoid wtf()."
am:
3fb2711ede
Change-Id: I6796d37e4458ef4da16d16f4c0f2bdd495007515
Colin Cross [Tue, 5 Dec 2017 01:10:14 +0000 (01:10 +0000)]
Merge "Remove unused AIDL files" am:
d0abc863f4 am:
43f665c95e
am:
3dbbd3d3a9
Change-Id: Ida23b5013fa6a3e1fd6ba3e5a699f798f29b4b84
Colin Cross [Tue, 5 Dec 2017 00:02:10 +0000 (16:02 -0800)]
Don't use path to find protoc-gen-javastream
Previous attempts to use a full path in the --plugin argument
failed, but that was because the --plugin argument had the wrong
name (protoc-gen-java-stream instead of protoc-gen-javastream)
and was being completely ignored. Passing a full path where
the last element of the path is protoc-gen-javastream works fine.
Fixes issues where the command line is expanded with $PATH in
it 58 times which could hit command length limits if $PATH was
even a little bit larger than the default.
Test: m framework
Change-Id: Icd336f522fb8770d9058d18d8a04d24a96405615
Colin Cross [Tue, 5 Dec 2017 01:08:41 +0000 (01:08 +0000)]
Merge "Fix droiddoc when OUT_DIR is an absolute path"
Colin Cross [Mon, 4 Dec 2017 21:45:19 +0000 (13:45 -0800)]
Fix droiddoc when OUT_DIR is an absolute path
The droiddoc rules were passing the sources in through
LOCAL_SRC_FILES, which gets prefixed with $(LOCAL_PATH). They
were prefixing ../.. to try to counter frameworks/base in
$(LOCAL_PATH), but that doesn't work for absolute paths to
generated files in an absolute $(OUT_DIR).
Use $(LOCAL_GENERATED_SOURCES) for anything that is in $(OUT_DIR)
instead, which takes paths that are relative to the top of the tree
or absolute.
Bug:
70166718
Test: m OUT_DIR=/tmp/out docs
Change-Id: I93b743607c2b8ce05512ecd4bbe860747cb48428
Merged-In: I93b743607c2b8ce05512ecd4bbe860747cb48428
(cherry-picked from commit
bd200ce7d4ebe31ad4327683e59af269420b0ef5)
Jeff Sharkey [Tue, 5 Dec 2017 00:58:46 +0000 (00:58 +0000)]
Merge "Match network roaming state to avoid wtf()."
Jordan Liu [Tue, 5 Dec 2017 00:55:51 +0000 (00:55 +0000)]
Merge "Make it possible to hide signal strength via Carrier Config" am:
febd180254 am:
516b41e5a5
am:
1470313b97
Change-Id: Ice7debdbe8caabb0fa1b530a9318f92c25b483af
Bookatz [Fri, 1 Dec 2017 01:09:30 +0000 (17:09 -0800)]
AnomalyDetection invalidity depends on MetricProd
DurationMetricProducer has extra conditions that must be satisfied for
an anomaly detection Alert (in the config) to be valid. This test must
only be run for DurationMetricProducer, and not other MetricProducers.
In the future, AnomalyTracker will be split into two, with a
DuratoinAnomalyTracker subclass that will be created by
DurationMetricProducer's createAnomalyTracker function.
Test: CTS test in progress
Change-Id: If172a71d15d5dabb2827859ddb2b5ff7ed386501
Jeff Sharkey [Wed, 29 Nov 2017 18:18:23 +0000 (11:18 -0700)]
API for apps to tag sockets with their own UID.
This enables app A to create a socket, pass it to app B, and have
app B accept blame for the traffic performed on that socket.
Also adds helpful public APIs for tagging raw FileDescriptor sockets
instead of making developers go through shady SocketImpl wrappers.
Test: cts-tradefed run commandAndExit cts-dev -m CtsAppSecurityHostTestCases -t android.appsecurity.cts.AppSecurityTests#testAppFailAccessPrivateData
Bug:
63932076
Change-Id: I08925c843974675fc82e4080cec2eaab9ab7cd41
Colin Cross [Tue, 5 Dec 2017 00:40:09 +0000 (00:40 +0000)]
Merge "Fix droiddoc when OUT_DIR is an absolute path"
Seigo Nonaka [Tue, 5 Dec 2017 00:33:36 +0000 (16:33 -0800)]
Fix TextViewTest.testHyphenationWidth
The root cause is the wrong expectation of getHyphen value.
Bug:
70160893
Test: bit FrameworksCoreTests:android.widget.TextViewTest#testHyphenationWidth
Change-Id: I9354cf322c003c4629ae88dd9b910c4043a86cc1
Colin Cross [Tue, 5 Dec 2017 00:34:32 +0000 (00:34 +0000)]
Merge "Remove unused AIDL files" am:
d0abc863f4
am:
43f665c95e
Change-Id: I3d966c647103c45f8a078adcb4260c08174cf61c
Adam Lesinski [Wed, 29 Nov 2017 21:24:29 +0000 (13:24 -0800)]
libandroidfw: Remove pre-verification
This added more up-front cost to loading an APK and didn't provide
a significant benefit to resource retrieval.
Test: make libandroidfw_tests
Change-Id: Idbf993abc433fa8c8950d106c66469b310b66f7f
Jordan Liu [Tue, 5 Dec 2017 00:26:44 +0000 (00:26 +0000)]
Merge "Make it possible to hide signal strength via Carrier Config" am:
febd180254
am:
516b41e5a5
Change-Id: I8b4c01595374604cd2a076f184e25531e63ed4bf
Wale Ogunwale [Tue, 5 Dec 2017 00:21:20 +0000 (00:21 +0000)]
Merge "Don't send userLeaving hint when entering split-screen mode."
Adam Lesinski [Tue, 5 Dec 2017 00:11:43 +0000 (00:11 +0000)]
Merge "libandroidfw: Add SparseEntry support for LoadedArsc"
Android Build Merger (Role) [Tue, 5 Dec 2017 00:08:49 +0000 (00:08 +0000)]
Merge "Merge "MacAddress: light refactors and improve documentation" am:
d871cab32d am:
2f7cb5752b am:
13b2fa0f85"
Hugo Benichi [Tue, 5 Dec 2017 00:06:50 +0000 (00:06 +0000)]
Merge "MacAddress: light refactors and improve documentation" am:
d871cab32d am:
2f7cb5752b
am:
13b2fa0f85
Change-Id: Iae0e87bcc9bd9c1ba98319f3b65f18f6743c02a0
Colin Cross [Tue, 5 Dec 2017 00:06:29 +0000 (00:06 +0000)]
Merge "Remove unused AIDL files"
am:
d0abc863f4
Change-Id: Ia6d798f6acf3930945cac488db81ccec3792648d
TreeHugger Robot [Tue, 5 Dec 2017 00:05:51 +0000 (00:05 +0000)]
Merge "Add integration tests for BackgroundDexOptService"
Hugo Benichi [Mon, 4 Dec 2017 23:51:41 +0000 (23:51 +0000)]
Merge "MacAddress: light refactors and improve documentation" am:
d871cab32d
am:
2f7cb5752b
Change-Id: I1e9948225e7c5ad64fad2e596d03deb3524c411c
Jordan Liu [Mon, 4 Dec 2017 23:44:36 +0000 (23:44 +0000)]
Merge "Make it possible to hide signal strength via Carrier Config"
am:
febd180254
Change-Id: Iff2bf2fa0132692b3164d5543cfd20cd1d153ede
Hugo Benichi [Mon, 4 Dec 2017 23:38:27 +0000 (23:38 +0000)]
Merge "MacAddress: light refactors and improve documentation"
am:
d871cab32d
Change-Id: I51bb8786ecd7f53e3342625c7a2625007eedfc0f
Treehugger Robot [Mon, 4 Dec 2017 23:35:35 +0000 (23:35 +0000)]
Merge "Remove unused AIDL files"
Patrick Baumann [Mon, 4 Dec 2017 19:29:24 +0000 (11:29 -0800)]
Sends resolving action to Instant App installer
This change adds the action being resolved to an installing Instant
App to the installer so it may increase friction for untrusted or
potentially dangerous sources (NFC, nearby, etc.)
Change-Id: If6c47a219e4ddf453fb406e2b212b024aa24ade6
Fixes:
63102749
Test: manual - debugged the ephemeral installer to ensure extra
Jordan Liu [Mon, 4 Dec 2017 23:20:31 +0000 (23:20 +0000)]
Merge "Make it possible to hide signal strength via Carrier Config"
Nathan Harold [Fri, 10 Nov 2017 00:49:33 +0000 (16:49 -0800)]
Validate IpSecAlgorithm Length
Improve the Validation of IpSecAlgorithm by
explicitly checking the length in addition to
the truncation length (previously an oversight).
In addition, we now check the lengths during
un-parceling, which will catch someone maliciously
manually building a parcel and passing it, bypassing
the checks in the constructor.
Bug:
68780091
Test: runtest -x IpSecAlgorithmTest.java
Change-Id: I8172762617264d34f47d5144336464510f07a701
Treehugger Robot [Mon, 4 Dec 2017 23:01:11 +0000 (23:01 +0000)]
Merge "MacAddress: light refactors and improve documentation"
Andreas Gampe [Mon, 4 Dec 2017 22:42:03 +0000 (14:42 -0800)]
Frameworks: Silently ignore InterruptedException
Apps seem to rely on this undocumented behavior so that the
threaded sync adapter doesn't crash an app. That's really
bad on the app side, but we will have to live with it.
Bug:
67986472
Bug:
70122540
Test: m
Test: Device boots
Test: m cts && cts-tradefed run commandAndExit cts-dev --module CtsContentTestCases -c android.content.cts.SharedPreferencesTest
Change-Id: I1ee4dfba4ad29c4f66fa60d3c8f8a99900b3447a
Ying Xu [Mon, 4 Dec 2017 22:57:26 +0000 (22:57 +0000)]
Merge "Convert ICarrierService to oneway." am:
a9494954d9 -s ours am:
be36500948 -s ours
am:
ff88684db3 -s ours
Change-Id: I95b6ea2a0b1f6cb43e84c27cd01909f9b5c016c3
Jeff Sharkey [Mon, 4 Dec 2017 22:52:01 +0000 (15:52 -0700)]
Match network roaming state to avoid wtf().
Test: sure
Bug:
70174865
Change-Id: I02faef05e3fb918c3c023fb2fdd1886d45cc8c71
Exempt-From-Owner-Approval: P0 bug
Ying Xu [Mon, 4 Dec 2017 22:43:44 +0000 (22:43 +0000)]
Merge "Convert ICarrierService to oneway." am:
a9494954d9 -s ours
am:
be36500948 -s ours
Change-Id: Iaaf170a63f97d00275bd55fa6f499f757ae98961
Tony Mantler [Mon, 4 Dec 2017 22:31:03 +0000 (22:31 +0000)]
Merge "Make sure Lifecycle proguard rules are used"
Colin Cross [Mon, 4 Dec 2017 21:45:19 +0000 (13:45 -0800)]
Fix droiddoc when OUT_DIR is an absolute path
The droiddoc rules were passing the sources in through
LOCAL_SRC_FILES, which gets prefixed with $(LOCAL_PATH). They
were prefixing ../.. to try to counter frameworks/base in
$(LOCAL_PATH), but that doesn't work for absolute paths to
generated files in an absolute $(OUT_DIR).
Use $(LOCAL_GENERATED_SOURCES) for anything that is in $(OUT_DIR)
instead, which takes paths that are relative to the top of the tree
or absolute.
Bug:
70166718
Test: m OUT_DIR=/tmp/out docs
Change-Id: I93b743607c2b8ce05512ecd4bbe860747cb48428
David Chen [Mon, 4 Dec 2017 22:28:43 +0000 (14:28 -0800)]
Tiny fix to bug when statsd should clear data.
Previously, we always sent a broadcast, even after we have exceeded
the memory limit for this config key. We switch the order so that
we drop the data if the limit is exceeded. If greater than 90% of the
way to the limit, we send the broadcast.
We need to find a way to unit-test this behavior.
Test: N/A.
Change-Id: I6ea40b9e34dceb19805d9af24495d72878f787e0
Ying Xu [Mon, 4 Dec 2017 22:27:57 +0000 (22:27 +0000)]
Merge "Convert ICarrierService to oneway."
am:
a9494954d9 -s ours
Change-Id: Ie385d36ff924adb152c36982ca11d741af44b48f
Amith Yamasani [Mon, 4 Dec 2017 22:21:32 +0000 (22:21 +0000)]
Merge "Allow privileged apps to query standby state"
Felipe Leme [Wed, 22 Nov 2017 02:00:56 +0000 (18:00 -0800)]
New Autofill API: let service set optional header and footer for dataset picker.
Test: atest CtsAutoFillServiceTestCases:FillResponseTest#testBuilder_setAuthentication_illegalState,testBuilder_setHeaderOrFooterInvalid,testBuilder_setHeaderOrFooterAfterAuthentication,testBuilder_build_headerOrFooterWithoutDatasets
Test: atest CtsAutoFillServiceTestCases:LoginActivityTest#testAutoFillOneDataset_withHeader,testAutoFillOneDataset_withFooter,testAutoFillOneDataset_withHeaderAndFooter
Test: atest CtsAutoFillServiceTestCases
Fixes:
69458670
Change-Id: I34be762968ffcad97dbf86898d3f1745bc8d4d64
Ying Xu [Mon, 4 Dec 2017 22:11:36 +0000 (22:11 +0000)]
Merge "Convert ICarrierService to oneway."
TreeHugger Robot [Mon, 4 Dec 2017 22:11:05 +0000 (22:11 +0000)]
Merge "Add metric for connected device advanced page."
Stefan Lafon [Mon, 4 Dec 2017 21:59:14 +0000 (21:59 +0000)]
Merge "Rename a few things in statsd_config.proto."
Yueming Wang [Mon, 4 Dec 2017 21:57:28 +0000 (21:57 +0000)]
Merge "Implement DevicePolicyManager.setSystemSettings."
Sanket Padawe [Mon, 4 Dec 2017 21:57:02 +0000 (21:57 +0000)]
Merge "Implement Call handover initiation side APIs."
yuemingw [Wed, 15 Nov 2017 19:22:27 +0000 (19:22 +0000)]
Implement DevicePolicyManager.setSystemSettings.
b/
67627818
Bug:
67627818
Test: runtest -x services/tests/servicestests/src/
com/android/server/devicepolicy/DevicePolicyManagerTest.java
design doc: https://docs.google.com/document/d/
1rvEg5jE3lMhjH-OA0iTLBUY2opM96fg7BrP81MoPnmg/edit#
Change-Id: If5f5c280957085480872f2d59ed59309cf288145
Patrick Baumann [Mon, 4 Dec 2017 21:46:27 +0000 (21:46 +0000)]
Merge "Makes adb install -r the default behavior"
TreeHugger Robot [Mon, 4 Dec 2017 21:28:42 +0000 (21:28 +0000)]
Merge "Make data RAT icon test pass"
TreeHugger Robot [Mon, 4 Dec 2017 21:03:22 +0000 (21:03 +0000)]
Merge "Stop using skjpeg_error_mgr in YuvToJpegEncoder"
TreeHugger Robot [Mon, 4 Dec 2017 20:51:27 +0000 (20:51 +0000)]
Merge "[RTT2] Fix build failure with new MacAddress"
Android Build Merger (Role) [Mon, 4 Dec 2017 20:28:34 +0000 (20:28 +0000)]
Merge "Merge "Convert framework.jar to Android.bp" am:
3d16ff7a4a -s ours am:
910fbf6562 -s ours am:
a691868a42 -s ours"
TreeHugger Robot [Mon, 4 Dec 2017 20:27:15 +0000 (20:27 +0000)]
Merge "Adds new API to retrieve statsd metadata."
Colin Cross [Mon, 4 Dec 2017 20:26:38 +0000 (20:26 +0000)]
Merge "Convert framework.jar to Android.bp" am:
3d16ff7a4a -s ours am:
910fbf6562 -s ours
am:
a691868a42 -s ours
Change-Id: I273e0a244141012b8fe15919ae445e815caea106
TreeHugger Robot [Mon, 4 Dec 2017 20:26:32 +0000 (20:26 +0000)]
Merge "Revert "Refactor MeasuredText""