OSDN Git Service
Wale Ogunwale [Sat, 24 Jun 2017 01:35:49 +0000 (01:35 +0000)]
Merge "Fixed some rotation while unlocking screen issue." into oc-dev
am:
0b138595de
Change-Id: I9cb5f092e253f06fc2abe4c90c9070ecf472125f
TreeHugger Robot [Sat, 24 Jun 2017 01:21:39 +0000 (01:21 +0000)]
Merge "Fixed some rotation while unlocking screen issue." into oc-dev
Selim Cinek [Sat, 24 Jun 2017 00:55:48 +0000 (00:55 +0000)]
Merge "Fixed an issue in the contrast calculation" into oc-dev
am:
9bf5c0c3e1
Change-Id: Ic93f722459de8da30b9b2f8971dfd0b650e37f10
Selim Cinek [Sat, 24 Jun 2017 00:44:08 +0000 (00:44 +0000)]
Merge "Fixed an issue in the contrast calculation" into oc-dev
Hugo Benichi [Sat, 24 Jun 2017 00:40:48 +0000 (00:40 +0000)]
Merge changes I193297e0,I43beb966 am:
c729ff8253
am:
5dec1df23b -s ours
Change-Id: If036f9c7b4219a20ddb21d5aa1b7f3e3b29bee51
Selim Cinek [Sat, 24 Jun 2017 00:22:38 +0000 (17:22 -0700)]
Fixed an issue in the contrast calculation
The parameters were passed the wrong way around.
Test: manual inspection
Fixes:
62937149
Change-Id: I7ae2bb2a4136da37d6b59b2b1406c68ce7fe7b6b
Hugo Benichi [Sat, 24 Jun 2017 00:13:24 +0000 (00:13 +0000)]
Merge changes I193297e0,I43beb966
am:
c729ff8253
Change-Id: Ie35f8cfe6ab77d0547f38b3bdcaf8f57832c0354
Hugo Benichi [Sat, 24 Jun 2017 00:01:22 +0000 (00:01 +0000)]
Merge changes I193297e0,I43beb966
* changes:
NetworkCapabilities: Added support for TRANSPORT_LOWPAN
Connectivity metrics: serialize networkId, transports, ifname
Bryce Lee [Fri, 23 Jun 2017 23:53:45 +0000 (23:53 +0000)]
Merge "Add ActivityInfo logging." into oc-dev
am:
4b6219dab3
Change-Id: I01029ae8a05578e615683f326fe66df0b1e05bf8
Bryce Lee [Fri, 23 Jun 2017 23:45:15 +0000 (23:45 +0000)]
Merge "Add ActivityInfo logging." into oc-dev
Bryce Lee [Fri, 23 Jun 2017 21:53:02 +0000 (14:53 -0700)]
Add ActivityInfo logging.
This changelist adds additional logging around the ActivityInfo used
during startActivity to trace down when the userid changes.
Bug:
38121026
Test: manual
Change-Id: I162f4772845bc2cae585b7e4b027f3cce33439f4
Wale Ogunwale [Fri, 23 Jun 2017 21:52:40 +0000 (14:52 -0700)]
Fixed some rotation while unlocking screen issue.
- Don't use snapshot that is in different orientation than the current
display orientation. This is a follow up to a previous CL whose
implementation wasn't complete.
- Disabled fixed for unnecessary relaunches when unlocking with
fingerprint sensor introduced in ag/
2310557. This causes regression in
the experience from N. We still have the relaunches, but we cover up the
delay by displaying the apps starting window.
- Added more trace log points.
Fixes:
62796190
Fixes:
62904487
Bug:
38494778
Test: go/wm-smoke and manual verification of bug.
Change-Id: Id161a334cb4455dd9eb25c6bb63d5bb3f8a6f1f0
susnata [Fri, 23 Jun 2017 22:43:03 +0000 (22:43 +0000)]
Merge "Fix for the missing focus in WebView form fields." into oc-dev
am:
c34dec82a9
Change-Id: Iec9bf203d787d5dcf585b8091bb32b20f1e09f37
TreeHugger Robot [Fri, 23 Jun 2017 22:33:10 +0000 (22:33 +0000)]
Merge "Fix for the missing focus in WebView form fields." into oc-dev
Elliott Hughes [Fri, 23 Jun 2017 21:26:41 +0000 (21:26 +0000)]
Merge "Replace MallocHelper with std::unique_ptr." am:
8330d5212d
am:
6dfb0ca3d5
Change-Id: Ib4853eeb3e5524935780881a1758262d50ab8e29
TreeHugger Robot [Fri, 23 Jun 2017 21:21:33 +0000 (21:21 +0000)]
Merge "resolve merge conflicts of
2e21f8d8cbbe to oc-dev-plus-aosp" into oc-dev-plus-aosp
Lucas Dupin [Fri, 23 Jun 2017 19:22:05 +0000 (19:22 +0000)]
Merge "Fix notification contrast with transparent bg" into oc-dev
am:
9b73401191
Change-Id: Iad0f7b3ff9db9128e825b72040cc4c9123dde4c1
Lucas Dupin [Fri, 23 Jun 2017 19:11:11 +0000 (19:11 +0000)]
Merge "Fix notification contrast with transparent bg" into oc-dev
Robert Sloan [Fri, 23 Jun 2017 19:09:47 +0000 (12:09 -0700)]
resolve merge conflicts of
2e21f8d8cbbe to oc-dev-plus-aosp
Test: I solemnly swear I tested this conflict resolution.
Change-Id: I9c6e9a52e67a06c16b6c8fb6f8eb4647b2fec508
Elliott Hughes [Fri, 23 Jun 2017 18:00:09 +0000 (18:00 +0000)]
Merge "Replace MallocHelper with std::unique_ptr."
am:
8330d5212d
Change-Id: I6ec7b1ddd823b48f3033546416e6ffc81d24c03a
Robert Sloan [Fri, 23 Jun 2017 17:53:23 +0000 (17:53 +0000)]
Merge "Don't statically link libcrypto in frameworks."
am:
a730fd2e64
Change-Id: I322c917f898d299db72272572453f968b4ec4beb
Elliott Hughes [Fri, 23 Jun 2017 17:51:45 +0000 (17:51 +0000)]
Merge "Replace MallocHelper with std::unique_ptr."
Treehugger Robot [Fri, 23 Jun 2017 17:42:38 +0000 (17:42 +0000)]
Merge "Don't statically link libcrypto in frameworks."
Siddharth Ray [Fri, 23 Jun 2017 17:19:45 +0000 (17:19 +0000)]
Merge "Emergency SUPL when location is disabled" into oc-dev
am:
2ffd98670f
Change-Id: I7f57683e774109f301e0763607853674c6fda9c9
TreeHugger Robot [Fri, 23 Jun 2017 17:12:22 +0000 (17:12 +0000)]
Merge "Emergency SUPL when location is disabled" into oc-dev
Lucas Dupin [Fri, 23 Jun 2017 16:30:49 +0000 (09:30 -0700)]
Fix notification contrast with transparent bg
Test: runtest -x packages/SystemUI/tests/src/com/android/systemui/statusbar/StatusBarIconViewTest.java
Change-Id: I2f0595408be61acb8267bb7449486ee46f7aad19
Fixes:
62937149
susnata [Fri, 23 Jun 2017 16:13:05 +0000 (09:13 -0700)]
Fix for the missing focus in WebView form fields.
This looks like a regression for WebView (58.0.3029.125) in android
'O'. But this seems to have been fixed in early version of 60 (webview).
This workaround gets us past the problem, until we get the newer version
of WebView.
Bug:
62449959
Test: Manual
Change-Id: I29883bf7d1567c1ce7be90b4efde4b3da93b99a2
Bill Yi [Fri, 23 Jun 2017 15:21:22 +0000 (15:21 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
am:
b39c08f9d7 -s ours
Change-Id: Ib2921d235716e858bddbbb2e3a9588b4133d9c84
TreeHugger Robot [Fri, 23 Jun 2017 15:11:46 +0000 (15:11 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
Bill Yi [Fri, 23 Jun 2017 12:49:12 +0000 (12:49 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
am:
d406f38d24 -s ours
Change-Id: I898195fead15228c4e4fa5617dacbddfc90dc6e2
TreeHugger Robot [Fri, 23 Jun 2017 12:42:32 +0000 (12:42 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
Vladimir Marko [Fri, 23 Jun 2017 10:55:48 +0000 (10:55 +0000)]
Merge "Rename Binder.destroy() to Binder.destroyBinder()." am:
a634b38c8e
am:
1b4b326128
Change-Id: I165243924444f89ee880072c55eba012ccf1d149
Vladimir Marko [Fri, 23 Jun 2017 10:45:32 +0000 (10:45 +0000)]
Merge "Rename Binder.destroy() to Binder.destroyBinder()."
am:
a634b38c8e
Change-Id: I5d80b7a76f1d9b3d7bfc152994551f0cd6defaba
Vladimir Marko [Fri, 23 Jun 2017 10:36:00 +0000 (10:36 +0000)]
Merge "Rename Binder.destroy() to Binder.destroyBinder()."
Bill Yi [Fri, 23 Jun 2017 07:43:50 +0000 (00:43 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ib851156b7d64c1f1c3ea398dc1d80602219d2c0f
Auto-generated-cl: translation import
Robert Quattlebaum [Mon, 15 May 2017 22:53:29 +0000 (15:53 -0700)]
NetworkCapabilities: Added support for TRANSPORT_LOWPAN
This change simply adds a new constant, `TRANSPORT_LOWPAN`, for
identifying low-power wireless networks like Thread.
Bug: b/
33073713
Merged-In: Ie4aa77496f8ff466fa1a5fbc556e9c029457a689
(cherry pick from commit
557e0c38b98f66d6147206f23d24d8d73b09e3e5)
Change-Id: I21f9b41b8b31c63ceeb1bc9c965f6da2614c356a
Test: runtest frameworks-net (not in original commit message)
Hugo Benichi [Wed, 15 Mar 2017 14:05:01 +0000 (23:05 +0900)]
Connectivity metrics: serialize networkId, transports, ifname
This patch adds translation from ConnectivityMetricsEvent to
IpConnectivityEvent of recently added fields:
- top-level network id
- top-level ifname
- transports
Also adds inference of link layer from transports or ifname.
At the moment these new fields are not populated in
ConnectivityMetricsEvent. Follow-up patches will fill this gap for
the events of the android.net.metrics package.
Test: new unit tests, $ runtest frameworks-net passes
Bug:
34901696
Merged-In: I563a6a3183470bdfaabb7c781a1beaf6b1058bf0
(partial cherry pick from commit
73fd4d1fafd0208e843abb6a6ad8a46a6fb18143)
Change-Id: I6a00270e73a1bd07f23c367f2394d90a43ced47a
Test: runtest frameworks-net (not in original commit message)
Winson Chung [Fri, 23 Jun 2017 05:24:01 +0000 (05:24 +0000)]
Merge "Ensure that the recent tasks are loaded for SysUI's current user." into oc-dev
am:
cd73cc4c6d
Change-Id: I380e262ab207e06b8a07b210d47cbc1294ba26f0
TreeHugger Robot [Fri, 23 Jun 2017 05:16:08 +0000 (05:16 +0000)]
Merge "Ensure that the recent tasks are loaded for SysUI's current user." into oc-dev
Roshan Pius [Fri, 23 Jun 2017 04:33:13 +0000 (04:33 +0000)]
Merge "WifiEnterpriseConfig: New copy method to ignore masked password" into oc-dev
am:
db11f55cb7
Change-Id: I9131d29ad8e192e7af7c596fb5d954e040adb968
TreeHugger Robot [Fri, 23 Jun 2017 04:26:45 +0000 (04:26 +0000)]
Merge "WifiEnterpriseConfig: New copy method to ignore masked password" into oc-dev
Seigo Nonaka [Fri, 23 Jun 2017 04:23:44 +0000 (04:23 +0000)]
Merge "Stop loading other package's font by default." into oc-dev
am:
824d75e0e1
Change-Id: I5518dbd8b5d8a4548ea00bbfca0e3aee87880ee7
Daniel Nishi [Fri, 23 Jun 2017 04:19:10 +0000 (04:19 +0000)]
Merge "Add in the getCacheQuotaBytes method to wrapper." into oc-dev
am:
f14c1e12cf
Change-Id: I48c0c952d4679304d1adcda238e93c6bdd133110
TreeHugger Robot [Fri, 23 Jun 2017 04:10:42 +0000 (04:10 +0000)]
Merge "Stop loading other package's font by default." into oc-dev
TreeHugger Robot [Fri, 23 Jun 2017 04:09:32 +0000 (04:09 +0000)]
Merge "Add in the getCacheQuotaBytes method to wrapper." into oc-dev
Bill Yi [Fri, 23 Jun 2017 03:47:22 +0000 (20:47 -0700)]
Import translations. DO NOT MERGE
Change-Id: I8e7e2885713047eef21b2885aa82aec71a5f5aa8
Auto-generated-cl: translation import
Marie Janssen [Fri, 23 Jun 2017 03:38:17 +0000 (03:38 +0000)]
Merge "Bluetooth: minor documentation fix to de-confuse" am:
5a56873612
am:
3205ff1331
Change-Id: I0cd44ad8d22da154d0bf666b9075a3fcbc655439
Marie Janssen [Fri, 23 Jun 2017 03:28:34 +0000 (03:28 +0000)]
Merge "Bluetooth: minor documentation fix to de-confuse"
am:
5a56873612
Change-Id: Ie202361631f9268055a190c8606e07d89dc349d4
Marie Janssen [Fri, 23 Jun 2017 03:17:35 +0000 (03:17 +0000)]
Merge "Bluetooth: minor documentation fix to de-confuse"
Wale Ogunwale [Fri, 23 Jun 2017 02:19:26 +0000 (02:19 +0000)]
Merge "Dump user id in dumpsys activity starter" into oc-dev
am:
b55b842898
Change-Id: I5b73df5e46d26d2008dba7a34345a0c37c099514
TreeHugger Robot [Fri, 23 Jun 2017 02:10:32 +0000 (02:10 +0000)]
Merge "Dump user id in dumpsys activity starter" into oc-dev
Seigo Nonaka [Thu, 22 Jun 2017 15:22:18 +0000 (08:22 -0700)]
Stop loading other package's font by default.
Since CONTEXT_RESTRICTED is not a default flag of createPackageContext,
we can't rely on it for preventing unexpected font injections.
To protect developers and existing apps from a risk of font injection,
stop loading font from other package's resouce unless the developer
explicitly set CONTEXT_IGNORE_SECURITY.
This CL contains Iac2a6fb3d82ef23d5ca6ee33f4aaa9ed28455271 by manual
merging to handle repository split.
Bug:
62813533
Bug:
62879353
Test: Manually done
Merged-In: I4442ddc48dadb5c968b444be86038b602074d301
Change-Id: I4442ddc48dadb5c968b444be86038b602074d301
Daniel Nishi [Fri, 23 Jun 2017 01:53:03 +0000 (18:53 -0700)]
Add in the getCacheQuotaBytes method to wrapper.
Bug:
62623731
Test: Settings Unit Test
Change-Id: Ibd779c7d9e60c44440483489b231ba0715321bc1
Felipe Leme [Fri, 23 Jun 2017 00:36:37 +0000 (00:36 +0000)]
Improved documentation for AutofillService package:
am:
2ef19c1d73
Change-Id: Iac283d34da149829a25313d0910f2564b347e332
Wale Ogunwale [Thu, 22 Jun 2017 23:43:53 +0000 (16:43 -0700)]
Dump user id in dumpsys activity starter
To help with ANR debugging.
Test: adb shell dumpsys activity starter
Bug:
38121026
Change-Id: I96d530662e6a362b817df3ca8410cb173a2c0dd4
Roshan Pius [Thu, 22 Jun 2017 18:36:53 +0000 (11:36 -0700)]
WifiEnterpriseConfig: New copy method to ignore masked password
To ignore the masked password sent by apps, add a new copy-constructor
equivalent method which will ignore the masked password.
Bug:
62893342
Test: Unit tests.
Test: Manual tests with the linked CL.
Test: Regression tests.
Change-Id: Ib208dcd94a888e07a9b3dc0442620233ea7791e5
Android Build Merger (Role) [Thu, 22 Jun 2017 22:37:54 +0000 (22:37 +0000)]
Merge "Merge "ASM Priority Boost Tool" am:
8ff8dd16cc am:
8ac18ceb8a" into oc-dev-plus-aosp
Todd Kennedy [Thu, 22 Jun 2017 22:35:06 +0000 (22:35 +0000)]
Merge "Allow any app to dynamically install a split" into oc-dev
am:
16503a8f7e
Change-Id: I13cf0e00de235d0bbdb79aa553e04386c519975d
Alan Leung [Thu, 22 Jun 2017 22:34:29 +0000 (22:34 +0000)]
Merge "ASM Priority Boost Tool" am:
8ff8dd16cc
am:
8ac18ceb8a
Change-Id: I68f86f307368de6870a7d649118d1a0f8c744a88
Felipe Leme [Mon, 5 Jun 2017 18:32:32 +0000 (11:32 -0700)]
Improved documentation for AutofillService package:
- Moved (and expanded) overall documentation from FillResponse to
AutofillService.
- Improved SaveInfo documentation.
- Improved FillRequest documentation.
- Improved Dataset documentation.
Bug:
37567048
Test: ran 'm -j doc-comment-check-docs' and checked resulting HTML
Change-Id: I157893deac06a5ed5e1cb7fd082da485f227b9ee
Alan Leung [Thu, 22 Jun 2017 22:24:51 +0000 (22:24 +0000)]
Merge "ASM Priority Boost Tool"
am:
8ff8dd16cc
Change-Id: Ifb62ee3132e984340e4457b543c4f84f7c45995a
Rob Carr [Thu, 22 Jun 2017 22:19:45 +0000 (22:19 +0000)]
Merge "ListPopupWindow: Wrap new bounds checking in targetSdk check." into oc-dev
am:
82b41e460c
Change-Id: I14f6fe76b3a24266432a8bc7286d1ae5da8f719d
TreeHugger Robot [Thu, 22 Jun 2017 22:11:44 +0000 (22:11 +0000)]
Merge "Allow any app to dynamically install a split" into oc-dev
Treehugger Robot [Thu, 22 Jun 2017 22:10:56 +0000 (22:10 +0000)]
Merge "ASM Priority Boost Tool"
Rob Carr [Thu, 22 Jun 2017 22:08:03 +0000 (22:08 +0000)]
Merge "ListPopupWindow: Wrap new bounds checking in targetSdk check." into oc-dev
Neil Fuller [Thu, 22 Jun 2017 21:49:28 +0000 (21:49 +0000)]
Merge "Fix code and test related to rules version check" am:
a3579d4b84
am:
c506ade205
Change-Id: Ia72b94700d1a65de769beace27e699e62aedcd9f
Shubang [Thu, 22 Jun 2017 21:44:18 +0000 (21:44 +0000)]
Merge "Change PIP notification icon" into oc-dev
am:
9f3967fee1
Change-Id: I1f12ec16adaa173d90ffbb62c5a88387340e4042
Neil Fuller [Thu, 22 Jun 2017 21:37:48 +0000 (21:37 +0000)]
Merge "Fix code and test related to rules version check"
am:
a3579d4b84
Change-Id: I2021e64f04e0e55de21dcdc0a932ce535e6a7f9f
TreeHugger Robot [Thu, 22 Jun 2017 21:31:56 +0000 (21:31 +0000)]
Merge "Change PIP notification icon" into oc-dev
Treehugger Robot [Thu, 22 Jun 2017 21:23:52 +0000 (21:23 +0000)]
Merge "Fix code and test related to rules version check"
Robert Sloan [Wed, 21 Jun 2017 23:15:44 +0000 (16:15 -0700)]
Don't statically link libcrypto in frameworks.
That creates duplicate copies of libcrypto in memory, which confuses
conscrypt.
Test: CtsLibcoreTestCases
Change-Id: I3b03d37feb405f14f8495015be7ff768b4347737
Merged-In: I547bb838befa743d72d356c186ff3cd355736589
Alan Leung [Sat, 13 May 2017 00:31:13 +0000 (17:31 -0700)]
ASM Priority Boost Tool
This tool is a replacement for the Jack plugin that allows injection
of static method calls before lock enter and exit.
A common use case would be to boost a thread's priority as soon as
it acquires a heavily contented lock and resetting the priority upon
release.
This tool is meant to be optionally invoked from /build/core/ rules
during the build process.
Test: JUnit Tests / resulting image on a bullhead.
Change-Id: If400414a0bf50f03768a1de2ebee42086a9d701f
Merged-In: If400414a0bf50f03768a1de2ebee42086a9d701f
(cherry picked from commit
93db63059ad5e9e1d59c8ce013559069d566ef4c)
Marie Janssen [Fri, 13 Jan 2017 00:00:30 +0000 (16:00 -0800)]
Bluetooth: minor documentation fix to de-confuse
It was somewhat unclear which is the preferred method of retrieving a
BluetoothAdapter. Make it clear that using BluetoothManager is
preferred, and remove references to the old method in BluetoothManager
docs since it is only avaialable in API 18 or higher.
Test: recompile, check that documentation is updated
Fix:
33355430
Change-Id: Ia20b4e45dca03bc2f13c2ab477799b89c5e14f45
Neil Fuller [Thu, 22 Jun 2017 16:58:02 +0000 (17:58 +0100)]
Fix code and test related to rules version check
Fix code and test related to an incorrectly implemented
rules version check.
This meant that a device could not return the rules version
it shipped with.
Another unused (and also confusing) method and
associated test is being deleted here.
To run tests:
make -j30 FrameworksServicesTests
adb install -r -g \
"out/target/product/angler/data/app/FrameworksServicesTests/FrameworksServicesTests.apk"
adb shell am instrument -e package com.android.server.timezone -w \
com.android.frameworks.servicestests \
"com.android.frameworks.servicestests/android.support.test.runner.AndroidJUnitRunner"
Test: See above.
Bug:
31008728
Change-Id: I31b55e88072dd73055cb3d8cf252be6eac920322
Siddharth Ray [Wed, 21 Jun 2017 22:14:44 +0000 (15:14 -0700)]
Emergency SUPL when location is disabled
A cycle of native_init() and native_cleanup() is needed so that
callbacks are registered after bootup even when location is disabled.
This will allow Emergency SUPL to work even when location is disabled
before device restart.
Merged-In: I423d5a7142709fc0579be009bb8b14d3778aa090
BUG:
38362097
Change-Id: I423d5a7142709fc0579be009bb8b14d3778aa090
Wale Ogunwale [Thu, 22 Jun 2017 19:58:40 +0000 (19:58 +0000)]
Merge "Added more systrace points to window manager" into oc-dev
am:
182d5ec2d2
Change-Id: I50d3778a7874656803a38594c0cdb1a5f95be123
Todd Kennedy [Thu, 22 Jun 2017 19:40:39 +0000 (12:40 -0700)]
Allow any app to dynamically install a split
Any application starting an activity resolved to a dyanmic split
should initiate split installation. Previously, only the application
defining the split could start installation of the split.
Bug:
62872325
Test: Manual; install instant app and start intent using 'adb shell am' and see that dynamic split installation occurs
Change-Id: I232dc5df82fb2c04653015a4a6b9f07c9e382205
TreeHugger Robot [Thu, 22 Jun 2017 19:30:40 +0000 (19:30 +0000)]
Merge "Added more systrace points to window manager" into oc-dev
Robert Carr [Wed, 21 Jun 2017 17:25:05 +0000 (10:25 -0700)]
ListPopupWindow: Wrap new bounds checking in targetSdk check.
While a negative height is pretty silly, crashing apps on
the new version of android makes them sad.
Test: Existing CTS passes.
Bug:
62434804
Change-Id: I5fc3fc50fb6ccfa9e96f38ded4fb8e338f263f09
Christopher Ferris [Thu, 22 Jun 2017 18:40:30 +0000 (18:40 +0000)]
Merge "Add a common call when wrapping an app." am:
12e0975963
am:
bb6cf84a40
Change-Id: I5a52a1cdfa5994f3f8c44e367c3a0bdbfba838fd
Christopher Ferris [Thu, 22 Jun 2017 18:32:22 +0000 (18:32 +0000)]
Merge "Add a common call when wrapping an app."
am:
12e0975963
Change-Id: I81830a6d826cd109c99f6e857204f96da9d4a656
Christopher Ferris [Thu, 22 Jun 2017 18:22:07 +0000 (18:22 +0000)]
Merge "Add a common call when wrapping an app."
Lucas Dupin [Thu, 22 Jun 2017 17:42:17 +0000 (17:42 +0000)]
Merge "Ensure icon contrast on the shelf" into oc-dev
am:
d0550a9b6c
Change-Id: I6eb862d98fb45a07ce07894e4afd5e0b33befa5d
Wale Ogunwale [Thu, 22 Jun 2017 16:08:14 +0000 (09:08 -0700)]
Added more systrace points to window manager
To help debug performance issues
Test: external/chromium-trace/systrace.py -t 3
Bug:
62796190
Change-Id: Ie6012a895174053c4732fb58b9365546fdb979de
TreeHugger Robot [Thu, 22 Jun 2017 17:25:10 +0000 (17:25 +0000)]
Merge "Ensure icon contrast on the shelf" into oc-dev
Jason Monk [Thu, 22 Jun 2017 15:45:37 +0000 (15:45 +0000)]
Merge "Fix ConcurrentModificationException from LocationController" into oc-dev
am:
6791bee744
Change-Id: If4957d57dd68bbbd459245c35ca8d049504e12bd
TreeHugger Robot [Thu, 22 Jun 2017 15:39:22 +0000 (15:39 +0000)]
Merge "Fix ConcurrentModificationException from LocationController" into oc-dev
Paul Duffin [Thu, 22 Jun 2017 14:39:08 +0000 (14:39 +0000)]
Merge "Ensure that android.test tests pass" am:
156775fea8
am:
34dc5a58b3
Change-Id: I546ea542d0781f825e131eb94bc54e22adadfc4e
Paul Duffin [Thu, 22 Jun 2017 14:29:01 +0000 (14:29 +0000)]
Merge "Ensure that android.test tests pass"
am:
156775fea8
Change-Id: I7fe4f45bd98acea016e02b44a4df38f0e907c0e4
Treehugger Robot [Thu, 22 Jun 2017 14:17:16 +0000 (14:17 +0000)]
Merge "Ensure that android.test tests pass"
Vladimir Marko [Wed, 21 Jun 2017 13:40:12 +0000 (14:40 +0100)]
Rename Binder.destroy() to Binder.destroyBinder().
There are a few AIDL-generated stubs that perform "destroy"
transactions and call "this.destroy()". Previously, this
resolved to the "destroy()" method from their interface on
ART while resolving to Binder.destroy() on the RI, though
this is a subject of a bug report against the JDK,
http://bugs.java.com/bugdatabase/view_bug.do?bug_id=
8021581 .
Resolving to the private Binder.destroy, inaccessible to
the Stub, would lead to throwing IllegalAccessErrror.
As we're changing the method lookup to be closer to RI, see
https://android-review.googlesource.com/413119 ,
we should stay clear of the problematic cases whether we
make a decision to follow the RI precisely or not. Therefore
we rename the Binder.destroy() to Binder.destroyBinder().
Test: Nexus 6P boots.
Bug:
62855082
Change-Id: I43baf76b6f3c681d93b411cecf2bc00fccafecac
Jason Monk [Thu, 22 Jun 2017 13:19:54 +0000 (09:19 -0400)]
Fix ConcurrentModificationException from LocationController
Test: runtest systemui
Change-Id: I0b7db7344217b3b7ad91f315100d1873e8167baf
Fixes:
62859544
Paul Duffin [Thu, 22 Jun 2017 11:52:18 +0000 (12:52 +0100)]
Ensure that android.test tests pass
It looks as though the tests in test-runner/tests have not actually been
run successfully for over 7 years. As a result they have degraded. This
change fixes the tests so that they will pass and provides instructions
on how to run them.
TestCaseUtilTest.testGetTestCaseNamesForTestSuiteWithSuiteMethod
This fails because it expected 2 names to be returned but only
returns 0. The reason for that is although TwoTestsInTestSuite has a
Test suite() method that does create a TestSuite with two tests the
TestCaseUtil method does not actually call suite(). Instead, because
TwoTestsInTestSuite is a TestSuite it just calls the tests() method
on it which returns an empty Enumeration because TwoTestsInTestSuite
is empty.
The support for "static Test suite() {}" is broken but fixing this
will affect the behavior of InstrumentationTestRunner which is used
in thousands of different places both in and outside Google and so
could cause untold problems.
TestSuiteBuilderTest.testIncludeAllPackagesUnderHere
Reformat the list, one per line and then add missing name
"testPublicConstructor".
ErrorTest/FailingTest
These tests are not meant to be run on their own, only as part of a
separate test. The RunAsPartOfSeparateTest annotation was added to
allow these to be excluded using notAnnotation as shown in the
instructions for running the tests.
Bug:
30188076
Test: followed new instructions in test-runner/tests/Android.mk
Change-Id: I60e7bee9cd08a9ab7777a2578fc58da772de5c1f
Erik Kline [Thu, 22 Jun 2017 11:34:29 +0000 (11:34 +0000)]
Merge "Create a TetherInterfaceStateMachine when told the interface name." into oc-dev
am:
be7657b038 -s ours
Change-Id: I1e1df0a71687c7156adcb2dd38016e07bb908713
TreeHugger Robot [Thu, 22 Jun 2017 11:27:28 +0000 (11:27 +0000)]
Merge "Create a TetherInterfaceStateMachine when told the interface name." into oc-dev
Narayan Kamath [Thu, 22 Jun 2017 10:37:47 +0000 (10:37 +0000)]
Merge "_exit(0) on clean shutdown, not _exit(1)" into oc-dev
am:
31cf02742e
Change-Id: I8314fcf2fc2fab8f8b4db84cec89efbc6c08660e
Narayan Kamath [Thu, 22 Jun 2017 10:32:28 +0000 (10:32 +0000)]
Merge "_exit(0) on clean shutdown, not _exit(1)" into oc-dev
Erik Kline [Thu, 22 Jun 2017 09:46:13 +0000 (09:46 +0000)]
Only disable Wi-Fi IP serving on specific interface, if available
am:
c8b180116d -s ours
Change-Id: If6064345828691ffcad1f1498a0d7940eff5486d
Erik Kline [Tue, 20 Jun 2017 12:18:31 +0000 (21:18 +0900)]
Create a TetherInterfaceStateMachine when told the interface name.
Test: as follows
- built
- flashed
- booted
- runtest frameworks-net passes
Bug:
32163131
Bug:
62343300
Merged-In: I542e013aa19fefd3443588c9a81ee59cd669ab6f
Merged-In: I973bdc5b540cce66a9713cebfd5071ad4a4b0a08
Merged-In: I2104ecf8102c8f9541ee2d3ce6589b0081db4fe3
Change-Id: I2104ecf8102c8f9541ee2d3ce6589b0081db4fe3
(cherry picked from commit
b912c50b197cc0fc49bb7897130581dd02d2af01)
Hugo Benichi [Thu, 22 Jun 2017 08:03:46 +0000 (08:03 +0000)]
Merge "ConnectivityManager: fix style issue" am:
e74f3adba5
am:
ec54a40339
Change-Id: I5a420534268a0daec19f1f0677dcfe7abd8faf73