OSDN Git Service
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
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
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"
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"
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
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
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 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
Colin Cross [Tue, 5 Dec 2017 00:40:09 +0000 (00:40 +0000)]
Merge "Fix droiddoc when OUT_DIR is an absolute path"
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"
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"
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"
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""
Julia Reynolds [Mon, 4 Dec 2017 20:24:03 +0000 (20:24 +0000)]
Merge "Update 'next alarm' tracking"
TreeHugger Robot [Mon, 4 Dec 2017 20:18:46 +0000 (20:18 +0000)]
Merge "Extreme battery saver: Log BS state in the event log."
TreeHugger Robot [Mon, 4 Dec 2017 19:46:51 +0000 (19:46 +0000)]
Merge "Refactored field detection mechanism to support multiple fields."
Eugene Susla [Mon, 4 Dec 2017 19:46:27 +0000 (19:46 +0000)]
Revert "Smooth scroll RecyclerView on a11y ACTION_SCROLL_*"
This reverts commit
8b2eb6fe54b4f0bb0707099c5b4bf1d69de49c16.
Change-Id: Ia872874026286e709a1fa5e071c510838405d264
TreeHugger Robot [Mon, 4 Dec 2017 19:43:44 +0000 (19:43 +0000)]
Merge "Switch RenderThread to a Java daemon thread"
Evan Laird [Mon, 4 Dec 2017 19:31:48 +0000 (14:31 -0500)]
Make data RAT icon test pass
Change merged in from aosp (I0428ba1749bdb884d210f1ff02cdf86b376a0ca8)
had a test written that was failing because the CL only updated the
status bar icon, not qs icon.
This is my attempt to make the code work as it seemed to be intended.
Test: runtest -x \
packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/NetworkControllerDataTest.java \
-m testAlwaysShowDataRatIcon
Change-Id: I4fe11c2e866cbb1f7784e4ed109671a957ffdf36
Colin Cross [Mon, 4 Dec 2017 19:32:11 +0000 (19:32 +0000)]
Merge "Convert framework.jar to Android.bp" into stage-aosp-master am:
05126403db
am:
1486d7b35d -s ours
Change-Id: Ia777383516cd511746b5cb998175c6a3b72df9c0
Colin Cross [Mon, 4 Dec 2017 19:21:53 +0000 (19:21 +0000)]
Merge "Convert framework.jar to Android.bp" am:
3d16ff7a4a -s ours
am:
910fbf6562 -s ours
Change-Id: I1105bd02d2f5be3676b1eb32d3de5e3ac010163b
TreeHugger Robot [Mon, 4 Dec 2017 19:21:00 +0000 (19:21 +0000)]
Merge "Extreme battery saver: Do not lower screen brightness"
Patrick Baumann [Tue, 28 Nov 2017 23:23:49 +0000 (15:23 -0800)]
Makes adb install -r the default behavior
This change ignores the -r indicator and only enforces that the
install be non-replacing when the -R flag is provided.
Change-Id: I9034ca06acbdaa99b458d4e6d8c3b379582b2bf0
Fixes:
30566724
Test: manual - ensured -r replaces and -R does not
Colin Cross [Thu, 30 Nov 2017 22:29:34 +0000 (14:29 -0800)]
Remove unused AIDL files
These files show up in a glob for all AIDL files, but are not listed
in AIDL files to be built, and have no references in codesearch
except for one unused import.
Bug:
70046217
Test: m checkbuild
Change-Id: I7d6a3bb19d2e16b5f09473f3058afcf5b4edd9b6
Colin Cross [Mon, 4 Dec 2017 19:05:46 +0000 (19:05 +0000)]
Merge "Convert framework.jar to Android.bp"
am:
3d16ff7a4a -s ours
Change-Id: I0652992a85c11b8be5f5b7428382bc3653c0e2a3
Stefan Lafon [Sun, 3 Dec 2017 22:27:25 +0000 (14:27 -0800)]
Rename a few things in statsd_config.proto.
This for frameworks/base/
SimpleLogEntryMatcher -> SimpleAtomMatcher.
simple_log_entry_matcher -> simple_atom_matcher
LogEntryMatcher -> AtomMatcher
log_entry_matcher -> atom_matcher
Test: Ran statsd_test.
Change-Id: I7398758e3fab86235897c162884f5ceab3002510
Colin Cross [Mon, 4 Dec 2017 18:55:24 +0000 (18:55 +0000)]
Merge "Convert framework.jar to Android.bp" into stage-aosp-master
am:
05126403db
Change-Id: I3d4ad90aff8415aeaf44d13805dd1267151f17d4
Colin Cross [Mon, 4 Dec 2017 18:53:39 +0000 (18:53 +0000)]
Merge "Convert framework.jar to Android.bp"
Colin Cross [Mon, 4 Dec 2017 18:43:35 +0000 (18:43 +0000)]
Merge "Convert framework.jar to Android.bp" into stage-aosp-master
Sudheer Shanka [Mon, 4 Dec 2017 18:30:30 +0000 (18:30 +0000)]
Merge "Allow shell to remove pkgs from powersave-temp-whitelist."
TreeHugger Robot [Mon, 4 Dec 2017 18:28:21 +0000 (18:28 +0000)]
Merge "Move WifiLinkLayerStats out of frameworks/base"
Seigo Nonaka [Mon, 4 Dec 2017 18:25:03 +0000 (18:25 +0000)]
Revert "Refactor MeasuredText"
This reverts commit
75492afb1b6566c889025e9ca0a15a0d0fe422aa.
Reason for revert:
70146381
Change-Id: Ibb6433b5e02608326ef51cc16d8d5d8efa86beec
Rubin Xu [Mon, 4 Dec 2017 18:23:31 +0000 (18:23 +0000)]
resolve merge conflicts of
2ff6320d773c to oc-dr1-dev am:
59f44d34c6 am:
92609c7db1
am:
b841254e85
Change-Id: Iddc1d91c300282a0c239f09c3c35b09fbe8a9538
David Chen [Wed, 22 Nov 2017 18:56:48 +0000 (10:56 -0800)]
Adds new API to retrieve statsd metadata.
This API can be used by clients to gather stats about statsd, eg.
memory usage, number of metrics/matchers, etc. This data can be used
to debug if devices are not providing expected metrics. The metadata
will be for all configurations, but will not contain the actual
collected metrics since those might have privacy implications.
Test: Tests that statsd and Android still build.
Bug:
69522276
Change-Id: I8e0fedc142f5deed7be6e6309f9444e67d8369ce
Etan Cohen [Mon, 4 Dec 2017 18:22:58 +0000 (10:22 -0800)]
[RTT2] Fix build failure with new MacAddress
Responder was using the new MacAddress before its finalization.
Fix reference to a (now removed) constructor.
Bug:
65014962
Test: unit tests & integration tests
Change-Id: I4d0fd32454c1362129e03deada2d6e6a253e2590
Julia Reynolds [Wed, 22 Nov 2017 15:56:18 +0000 (10:56 -0500)]
Update 'next alarm' tracking
Also improves logging and adds tests.
Test: runtest systemui-notification
Bug:
67028535
Bug:
69440234
Change-Id: I259fdc2d253d2a4ac415e23bd66a0b9d7c69b053
Abodunrinwa Toki [Mon, 4 Dec 2017 18:13:25 +0000 (18:13 +0000)]
Merge "Primary/Secondary actions in TextClassification."
Zak Cohen [Mon, 4 Dec 2017 18:08:28 +0000 (18:08 +0000)]
Merge "Make single volume devices more robust to ringer mode changes."
TreeHugger Robot [Mon, 4 Dec 2017 18:07:27 +0000 (18:07 +0000)]
Merge "Resolve merge conflicts of
710b3946e535 to master"
Jonathan Basseri [Tue, 25 Jul 2017 20:34:36 +0000 (13:34 -0700)]
Convert ICarrierService to oneway.
Change the carrier config AIDL used by CarrierService to a oneway call.
This is the IPC used to fetch carrier config bundles from carrier apps.
Converting to oneway allows CarrierConfigLoader to be non-blocking while
it fetches config.
Bug:
63176442
Test: runtest carrierconfig-unit & manual
(cherry picked from commit
49b54d64ca5c2aa08021c2ad747597cdd4486ad8)
Merged-in: Iceaf0446321f719011f67897398da7d5998c5fc7
Change-Id: I436f6c920f68f8bbc0fd66a5ff10676ed1529383
Felipe Leme [Mon, 27 Nov 2017 21:09:13 +0000 (13:09 -0800)]
Refactored field detection mechanism to support multiple fields.
Now instead of using FillResponse.setFieldDetection() with an object that
contains both the autofill ids an the user data, service must:
- Set global mapping through AutofillService.setUserData()
- Pass just the autofill ids to FillResponse.setFieldClassificationIds()
This CL is purely a refactoring CL - although the new API supports multiple
values and multiple fields, the implementation is still hardcode for one
value and one field (as before).
Test: atest CtsAutoFillServiceTestCases:FieldsClassificationTest
Test: atest CtsAutoFillServiceTestCases:UserDataTest
Test: atest CtsAutoFillServiceTestCases:FillResponseTest
Bug:
68045531
Change-Id: I8d846d817dfcde3a4db7abff798bb2250e1c4e7b
Wale Ogunwale [Thu, 30 Nov 2017 19:05:43 +0000 (11:05 -0800)]
Don't send userLeaving hint when entering split-screen mode.
If the current activity stack we are resuming is in multi-window mode
and the last resumed activity stack should still be visible, then don't
send userLeaving hint as the activity will still be visible to the user
after onPause is called.
Also, added option to say if recents activity should be shown when
split-screen is activated. starting the recents activity during
CTS testing can cause timing issues since the recents activity might
be started after the activity we are trying to launch adjacent to
split-screen.
Change-Id: Iba1d0749062e7365a207ba1172705b5ab70cb869
Fixes:
69419620
Test: ActivityManagerSplitScreenTests.testNoUserLeaveHintOnMultiWindowModeChanged
Rubin Xu [Mon, 4 Dec 2017 17:18:18 +0000 (17:18 +0000)]
resolve merge conflicts of
2ff6320d773c to oc-dr1-dev am:
59f44d34c6
am:
92609c7db1
Change-Id: Ib0f01cb899121d2e0cf0e3c3270f9c453be69013
Chavi Weingarten [Mon, 4 Dec 2017 17:10:30 +0000 (17:10 +0000)]
Merge changes from topic "hw_bitmap"
* changes:
Update screenshot requests to render proper crop and rotation.
Revert "Revert "Updated screenshot code to reflect native changes.""
Rubin Xu [Mon, 4 Dec 2017 17:07:19 +0000 (17:07 +0000)]
resolve merge conflicts of
2ff6320d773c to oc-dr1-dev
am:
59f44d34c6
Change-Id: I7afc27da73c5a54537fcd8f49128752e00a954ea
Leon Scroggins III [Mon, 4 Dec 2017 16:37:30 +0000 (11:37 -0500)]
Stop using skjpeg_error_mgr in YuvToJpegEncoder
Bug: None
Test: compile
skjpeg_error_mgr is only different from the standard one in that it
includes a jmp_buf. A recent change to skjpeg_error_mgr stores a stack
of jmp_bufs (see https://skia-review.googlesource.com/c/skia/+/79241).
This complexity is unnecessary for YuvToJpegEncoder, which only contains
a single method with libjpeg calls (which might call longjmp). Simplify
this code by placing the jmp_buf on the stack. This fixes the Skia to
Android roll, which includes the above Skia change.
Change-Id: If9a33ed10ea60131906a632a7030e0b69a21f4ea
Evan Laird [Mon, 4 Dec 2017 15:46:37 +0000 (10:46 -0500)]
Resolve merge conflicts of
710b3946e535 to master
Test: runtest -x
packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/NetworkControllerDataTest.java
Change-Id: I95ed65102c3d61a0afa0744663d6966c10f876e5
Bryce Lee [Mon, 4 Dec 2017 15:29:31 +0000 (15:29 +0000)]
Merge "Make ActivityStarter single use."
Evan Laird [Mon, 4 Dec 2017 15:04:39 +0000 (15:04 +0000)]
Merge "SystemUI: Display RAT icon when data is off" am:
e441298a11
am:
1fed537674
Change-Id: I32a4c932a9abdacd1fd43a34b650a88377b1ed07
Evan Laird [Mon, 4 Dec 2017 14:50:15 +0000 (14:50 +0000)]
Merge "SystemUI: Display RAT icon when data is off"
am:
e441298a11
Change-Id: I483d17ac1ef79b9b6f31bbefaf03f7833e13020b
Evan Laird [Mon, 4 Dec 2017 14:37:16 +0000 (14:37 +0000)]
Merge "SystemUI: Display RAT icon when data is off"
Hugo Benichi [Thu, 16 Nov 2017 05:40:16 +0000 (14:40 +0900)]
MacAddress: light refactors and improve documentation
This patch does some light refactoring in MacAddress to prepare for
exposing MacAddress in the public api:
- documention is improved
- some method names are renamed
- a toSafeString method is added
- a padding bug in the conversion methods outputting strings for
mac addresses is fixed
Bug:
69390696
Test: runtest frameworks-net
Change-Id: I399a97dabc2dfa8df9c5518c8b12484e43ca05c9
TreeHugger Robot [Mon, 4 Dec 2017 12:03:44 +0000 (12:03 +0000)]
Merge "Heads up notification can now scroll away after it was seen"