OSDN Git Service
TreeHugger Robot [Tue, 12 Dec 2017 01:19:46 +0000 (01:19 +0000)]
Merge "Refactor system properties protos to just include the list treble team defines go/treble-sysprop-compatibility."
TreeHugger Robot [Tue, 12 Dec 2017 01:04:57 +0000 (01:04 +0000)]
Merge "incidentd: Removing history from batterystats dump."
TreeHugger Robot [Tue, 12 Dec 2017 01:03:51 +0000 (01:03 +0000)]
Merge "Migrate IME related tests to JUnit4"
TreeHugger Robot [Tue, 12 Dec 2017 00:48:22 +0000 (00:48 +0000)]
Merge "Cancel alarms & jobs when an app's data is cleared"
Todd Kennedy [Tue, 12 Dec 2017 00:37:35 +0000 (00:37 +0000)]
Merge "Fix package manager tests"
Holly Jiuyu Sun [Tue, 12 Dec 2017 00:12:44 +0000 (00:12 +0000)]
Merge "Carrier confirmation code." am:
6627d2c4df am:
0e788e00b6
am:
486385092b -s ours
Change-Id: I34d9496ee29684f5a1ceb6c9ab01ad87ffe72e8d
TreeHugger Robot [Tue, 12 Dec 2017 00:03:56 +0000 (00:03 +0000)]
Merge "Add Chromium ARC EventLogTags"
TreeHugger Robot [Tue, 12 Dec 2017 00:00:34 +0000 (00:00 +0000)]
Merge "SoundPool: remove unused header file."
Holly Jiuyu Sun [Mon, 11 Dec 2017 23:58:48 +0000 (23:58 +0000)]
Merge "Carrier confirmation code." am:
6627d2c4df
am:
0e788e00b6
Change-Id: Ibbb439b724ee031b76ff42ecd84c3c1f2df69ae1
Holly Jiuyu Sun [Mon, 11 Dec 2017 23:48:04 +0000 (23:48 +0000)]
Merge "Carrier confirmation code."
am:
6627d2c4df
Change-Id: I444b27d11472cd9a84e4df3b5ae624fba0b13e71
Holly Jiuyu Sun [Mon, 11 Dec 2017 23:29:34 +0000 (23:29 +0000)]
Merge "Carrier confirmation code."
Yohei Yukawa [Mon, 11 Dec 2017 23:09:28 +0000 (15:09 -0800)]
Migrate IME related tests to JUnit4
This CL cleans up remaining use of InstrumentationTestCase from
IME-related FrameworksCoreTests as it is already deprecated in favor of
testing-support-library.
There should be no behavior change in tests and their expectations.
Fixes:
70514197
Test: atest FrameworksCoreTests:com.android.internal.inputmethod.InputMethodSubtypeSwitchingControllerTest
Test: atest FrameworksCoreTests:com.android.internal.inputmethod.InputMethodUtilsTest
Test: atest FrameworksCoreTests:com.android.internal.inputmethod.LocaleUtilsTest
Test: atest FrameworksCoreTests:android.view.inputmethod.CursorAnchorInfoTest
Test: atest FrameworksCoreTests:android.view.inputmethod.InputMethodSubtypeArrayTest
Test: atest FrameworksCoreTests:android.view.inputmethod.InputMethodSubtypeTest
Test: atest FrameworksCoreTests:android.view.inputmethod.SparseRectFArrayTest
Change-Id: I28f073aacb6f77c62bd186c37cbdb5719475d4ba
Yi Jin [Wed, 6 Dec 2017 01:44:48 +0000 (17:44 -0800)]
Refactor system properties protos to just include the list treble team
defines http://go/treble-sysprop-compatibility.
Also refactored system properties proto to have nested proto
definitions. The reason to do it is to have flat proto definition makes
it super hard to manage its field numbers as well as hard to use.
Since we have a predefined list. Support parsing nested proto here.
Bug:
68774852
Test: unit tested and on device test
$ out/host/linux-x86/bin/incident_report -w system_properties
Change-Id: Icfc7cdcae184fb204c81e6434d21399aa84a1285
TreeHugger Robot [Mon, 11 Dec 2017 22:47:10 +0000 (22:47 +0000)]
Merge "Always invoke scrim callback"
TreeHugger Robot [Mon, 11 Dec 2017 22:22:39 +0000 (22:22 +0000)]
Merge "Fix testCursorIsOnRight test case"
TreeHugger Robot [Mon, 11 Dec 2017 22:21:12 +0000 (22:21 +0000)]
Merge "Introduce API to enable existing packages on shared users"
Shuo Qian [Mon, 11 Dec 2017 22:19:52 +0000 (22:19 +0000)]
Merge "Add ICCID_PREFIX column in CarridId DB"
TreeHugger Robot [Mon, 11 Dec 2017 22:17:42 +0000 (22:17 +0000)]
Merge "Temporaly ignoring UID check when caller is a system app."
TreeHugger Robot [Mon, 11 Dec 2017 21:51:41 +0000 (21:51 +0000)]
Merge "OMS: Only allow trusted overlays to be registered."
TreeHugger Robot [Mon, 11 Dec 2017 21:45:04 +0000 (21:45 +0000)]
Merge "Change colors to allow transport of more generic ints"
Todd Kennedy [Mon, 11 Dec 2017 21:26:14 +0000 (13:26 -0800)]
Fix package manager tests
Test: bit FrameworksServicesTests:com.android.server.pm.
Change-Id: I06089adcdf6cdaebc7176cab30254cc2cbd836eb
TreeHugger Robot [Mon, 11 Dec 2017 21:14:44 +0000 (21:14 +0000)]
Merge "Enable fast drawing for solid color nine patch rectangles"
Lucas Dupin [Mon, 11 Dec 2017 20:42:26 +0000 (12:42 -0800)]
Always invoke scrim callback
Callback needs to be invoked if we're trying to switch
to the same state, otherwise the window will never know
that we're done fading the keyguard.
Change-Id: I6779ecf18fbb23f621731d851ab343b82c3529e3
Fixes:
70481733
Fixes:
70392591
Test: Unlock by tapping on notification
Test: Unlock with pin, fingerprint
Test: Unlock with fingerprint when pulsing
Test: Unlock by tapping on notification when pulsing
Test: Open Settings from QS when Maps is SHOW_WHEN_LOCKED
Test: runtest -x packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/ScrimControllerTest.java
TreeHugger Robot [Mon, 11 Dec 2017 20:44:25 +0000 (20:44 +0000)]
Merge changes I2a808b9f,I8cbd4651
* changes:
Implements queryNanoApps API
Implements the new loadNanoApp/unloadNanoApp APIs
TreeHugger Robot [Mon, 11 Dec 2017 20:39:44 +0000 (20:39 +0000)]
Merge "Simplify IMMS#startVrInputMethodNoCheck a bit"
Kweku Adams [Mon, 11 Dec 2017 20:30:35 +0000 (12:30 -0800)]
incidentd: Removing history from batterystats dump.
Bug:
65750808
Test: N/A
Change-Id: I4790b616791f68833196b50b76d3fd24faa8d46b
Seigo Nonaka [Mon, 11 Dec 2017 19:39:51 +0000 (11:39 -0800)]
Fix testCursorIsOnRight test case
This is partial revert of Ie932903845645e50cfa0cb428babb31a44babc47
The root cause is MeasuredText.getParagraphDir respect requsted text
direction even if it is an empty text. Ideally we don't need to create
MeasuredText object for empty string but for safety, reverted to the
original code.
Bug:
70384435
Test: bit FrameworksCoreTests:android.widget.EditorCursorTest
Change-Id: Id24405f476c50fa27743589a640281d96de1c9ce
TreeHugger Robot [Mon, 11 Dec 2017 20:24:26 +0000 (20:24 +0000)]
Merge "Fix issue #
69820174: The size of /proc/meminfo is larger than its stored buffer."
TreeHugger Robot [Mon, 11 Dec 2017 20:23:20 +0000 (20:23 +0000)]
Merge "Restore volume expansion."
susanta.patra [Mon, 11 Dec 2017 20:00:17 +0000 (20:00 +0000)]
Merge "Fixed button bar alignment issue in RTL languages" am:
403c8f72e3 am:
2063b1f792
am:
bf62defed2
Change-Id: I7113cb185049848344c01b857e8a8646e9967432
Felipe Leme [Mon, 11 Dec 2017 18:45:59 +0000 (10:45 -0800)]
Temporaly ignoring UID check when caller is a system app.
The Settings app runs some of its activities in another process, which would
crash it in some cases due to a recent security fix on Autofill.
This CL temporarily fixes the problem by skipping the security check when the
caller is a system app.
Test: manual verification using System.out statements, as it cannot be
reproduced by CTS because the CTS app is an user app.
Bug:
70506888
Change-Id: I08e8a370d93d3473ec5e025afaf3bc6f456e0ab9
Jason Monk [Sun, 10 Dec 2017 18:49:59 +0000 (13:49 -0500)]
Change colors to allow transport of more generic ints
This is in preparation for sliders, also add some hints/types that
will be used for sliders.
Test: atest cts/tests/tests/slice
Bug:
68378584
Change-Id: I8f6a8bb7c80854b51c421a437318975f517a2169
susanta.patra [Mon, 11 Dec 2017 19:41:40 +0000 (19:41 +0000)]
Merge "Fixed button bar alignment issue in RTL languages" am:
403c8f72e3
am:
2063b1f792
Change-Id: I7493a720ef88f0b40ebed483d474a34ad9ee5da4
TreeHugger Robot [Mon, 11 Dec 2017 19:36:57 +0000 (19:36 +0000)]
Merge "Fix resizing when hardware renderer is off."
susanta.patra [Mon, 11 Dec 2017 19:28:44 +0000 (19:28 +0000)]
Merge "Fixed button bar alignment issue in RTL languages"
am:
403c8f72e3
Change-Id: I8a14f71b20fd07ac3fd9025ba4e303a11709fe0a
Ricardo Quesada [Mon, 11 Dec 2017 19:26:53 +0000 (11:26 -0800)]
Add Chromium ARC EventLogTags
Add EventLogTags for org.chromium.arc package.
Small CL that enables org.chromium.arc EventLogTags in master.
Bug:
70513529
Test: compiled on marlin. did not generate any conflict. marlin worked
Ok.
Change-Id: I4bda5985c337e0b3434774c4b6b11c83d3ac49ed
Treehugger Robot [Mon, 11 Dec 2017 19:10:46 +0000 (19:10 +0000)]
Merge "Fixed button bar alignment issue in RTL languages"
Arthur Ishiguro [Tue, 28 Nov 2017 00:26:34 +0000 (16:26 -0800)]
Implements queryNanoApps API
Bug:
67734082
Test: Run a test app to use the new query API, verify returns the
expected set of nanoapps
Change-Id: I2a808b9f80dd0d9168466f80b79ca1fa35da242c
Chris Tate [Mon, 11 Dec 2017 18:33:30 +0000 (18:33 +0000)]
Merge "Fix system crash in certain jobs-removed cases"
Stan Iliev [Mon, 4 Dec 2017 19:48:27 +0000 (14:48 -0500)]
Enable fast drawing for solid color nine patch rectangles
Pass a hint to Skia, about which lattice rectangles are solid
color rectangles.
Bug:
69796044
Test: Measured ninepatch performance using sample app from the bug
Change-Id: Ib07b1b64c78ab16195f9af88a989d28682084565
Julia Reynolds [Mon, 11 Dec 2017 18:18:03 +0000 (13:18 -0500)]
Restore volume expansion.
Test: manual
Bug:
63096355
Change-Id: Ibff2826084353b66a6e1376cb9dda3e01dcf0e72
Greg Daniel [Mon, 11 Dec 2017 18:03:36 +0000 (18:03 +0000)]
Merge "Update GrContext creation calls to use sk_sp"
Selim Cinek [Mon, 11 Dec 2017 17:21:37 +0000 (17:21 +0000)]
Merge "Fixed a crash with the top headsup entry"
Jeff Sharkey [Mon, 11 Dec 2017 16:47:13 +0000 (16:47 +0000)]
Merge "Add auto-doc support for @StringDef."
luozhanwei [Mon, 11 Dec 2017 16:26:25 +0000 (16:26 +0000)]
Merge "[DeadLock]AMS PMS MountService" am:
998ac99db4 am:
41fb54b955
am:
81544d2a71
Change-Id: Ib92a19bce9fd9086c302c2cf4606b5d10161fe85
luozhanwei [Mon, 11 Dec 2017 16:14:17 +0000 (16:14 +0000)]
Merge "[DeadLock]AMS PMS MountService" am:
998ac99db4
am:
41fb54b955
Change-Id: I15056a18d70a1d17c52799f71e8faf5c565bb8aa
luozhanwei [Mon, 11 Dec 2017 16:05:19 +0000 (16:05 +0000)]
Merge "[DeadLock]AMS PMS MountService"
am:
998ac99db4
Change-Id: I5910f42d91c3c3edcc092a87cc2e291d6e83e75e
Treehugger Robot [Mon, 11 Dec 2017 15:47:45 +0000 (15:47 +0000)]
Merge "[DeadLock]AMS PMS MountService"
TreeHugger Robot [Mon, 11 Dec 2017 15:33:22 +0000 (15:33 +0000)]
Merge "Keystore: Fix KeyGenParameterSpec parceling"
Tom Dobek [Mon, 11 Dec 2017 15:13:23 +0000 (15:13 +0000)]
Merge "Aapt2 convert: skip processing resources when resource table is absent. Test: manual"
Greg Daniel [Fri, 8 Dec 2017 16:44:27 +0000 (11:44 -0500)]
Update GrContext creation calls to use sk_sp
Test: manual testing
Change-Id: I68d8706ffa7bc7c6622ea0b8c45d7297a131f6bf
Neil Fuller [Mon, 11 Dec 2017 14:35:22 +0000 (14:35 +0000)]
Merge "Tidy up changes for timezone update code"
Alex Chau [Tue, 5 Dec 2017 16:49:19 +0000 (16:49 +0000)]
Introduce API to enable existing packages on shared users
- Also unhide setKeepUninstalledPackages
- installExistingPackage accpets delegation API because all app
managemnet PIs did the same, including setKeepUninstalledPackages and
enableSytemApp
Bug:
70017947
Bug:
65842106
Test: Install apps already installed in u0 in shared user should succeed
Test: Install apps in setKeepUninstalledPackages cache in shared user
should succeed
Test: Install apps via delegated package should succeed
Test: Install apps via unaffiliated profile owner should fail
Test: Install apps not installed in any user or in APK cache shoudl fail
Change-Id: Iba563b2050abd0d1f46bfa06cfc0526b7b476b3b
Eran Messeri [Sat, 9 Dec 2017 21:25:04 +0000 (21:25 +0000)]
Keystore: Fix KeyGenParameterSpec parceling
Fix the way KeyGenParameterSpec is parceled, by correctly handling
default and null values for some of the fields.
A recent CL added the ability to parcel/unparcel KeyGenParameterSpec (by
a separate class).
Due to refactoring late in the CL review cycle, the parceling code did
not take into account a few edge cases.
Unit tests:
m -j KeystoreTests && adb install -r out/target/product/marlin/data/app/KeystoreTests/KeystoreTests.apk
adb shell am instrument 'android.security.tests/android.support.test.runner.AndroidJUnitRunner'
CTS tests:
cts-tradefed run commandAndExit cts-dev -a armeabi-v7a -m CtsDevicePolicyManagerTestCases -t com.android.cts.devicepolicy.DeviceOwnerTest#testKeyManagement -l DEBUG
Bug:
69337278
Test: Keystore unit tets (see instructions above) and cts Key Management test.
Change-Id: Ie08f42b07fb55b6fa1d8fb73c89d69687c97e214
Tom Dobek [Fri, 8 Dec 2017 14:19:01 +0000 (14:19 +0000)]
Aapt2 convert: skip processing resources when resource table is absent.
Test: manual
Change-Id: Iafe20f98857a29d625e7a57a9201db6279d43e45
TreeHugger Robot [Mon, 11 Dec 2017 06:35:31 +0000 (06:35 +0000)]
Merge "API Review: Drop "Button" in is/setLogoutEnabled method"
TreeHugger Robot [Mon, 11 Dec 2017 06:11:56 +0000 (06:11 +0000)]
Merge "Add TaskPositioningController"
sqian [Thu, 30 Nov 2017 19:26:56 +0000 (11:26 -0800)]
Add ICCID_PREFIX column in CarridId DB
Bug:
64131637
Test: Treehugger runs providers/telephony/CarrierIdProviderTest.java
Change-Id: I0d118ab181dfe17a7976a0b654989a3662594d4a
Yohei Yukawa [Mon, 11 Dec 2017 02:15:19 +0000 (18:15 -0800)]
Simplify IMMS#startVrInputMethodNoCheck a bit
This is a follow up CL to a recent CL [1] that added VR-IME support.
Currently, IMMS#startVrInputMethodNoCheck() internally calls
IMMS#setInputMethodEnabled(), which enforces the caller user ID check
and caller permission check for WRITE_SECURE_SETTINGS.
This appears to make sense for IMMS#startVrInputMethodNoCheck(), but
in reallity IMMS#startVrInputMethodNoCheck() always gets called on
non-binder system server thread hence those checks will never fail.
Note that such a call path is fine and not a security issue. What this
CL tries to address is just replace IMMS#setInputMethodEnabledLocked()
to make it clear that IMMS allows such an operation for callers that
have RESTRICTED_VR_ACCESS is intentional.
To summarize, this CL just removes redundant operations and there
should be no visible behavior change.
[1]: I1db7981b5198e7e203d4578cae7e5b6d20037d0d
89a6c48a8b2e54f9b93211c20a126edab0eefe35
Bug:
63037786
Test: compile
Change-Id: Iec43177bd698de6efa453d64ceafec3164538151
Daichi Hirono [Mon, 4 Dec 2017 01:00:24 +0000 (10:00 +0900)]
Add TaskPositioningController
The CL creates new TaskPositioningController class which lives over the
process WindowManagerService's life time and handle task positioning
tasks like resizing or moving by drag.
Bug:
64149458
Test: atest com.android.server.wm.TaskPositioningControllerTests
Change-Id: I65b3226ce5fa93c16037671ab9cd3b3d84d8f274
Hugo Benichi [Mon, 11 Dec 2017 00:37:22 +0000 (00:37 +0000)]
Merge "DefaultNetworkEvent: fix two bugs with validation times" am:
c0d951c3e0 am:
144d9e9f83
am:
51e563aefb
Change-Id: Ide65494bfe095533a06c4b33002fbd260306f8a0
Hugo Benichi [Mon, 11 Dec 2017 00:24:33 +0000 (00:24 +0000)]
Merge "DefaultNetworkEvent: fix two bugs with validation times" am:
c0d951c3e0
am:
144d9e9f83
Change-Id: Iad5a7cda8b73f638aa7db8ae38bdccef1cbeae85
Hugo Benichi [Mon, 11 Dec 2017 00:12:16 +0000 (00:12 +0000)]
Merge "DefaultNetworkEvent: fix two bugs with validation times"
am:
c0d951c3e0
Change-Id: I94489cb28fad5d8adddb200b44d72bab2be70b97
Hugo Benichi [Sun, 10 Dec 2017 23:54:13 +0000 (23:54 +0000)]
Merge "DefaultNetworkEvent: fix two bugs with validation times"
Robert Berry [Sun, 10 Dec 2017 17:35:55 +0000 (17:35 +0000)]
Merge "Add helpers for generating keys, wrapping them, and persisting them"
TreeHugger Robot [Sat, 9 Dec 2017 19:51:00 +0000 (19:51 +0000)]
Merge "Prevent reporting fake package name - framework"
Svet Ganov [Sat, 2 Dec 2017 20:32:23 +0000 (12:32 -0800)]
Prevent reporting fake package name - framework
Test: added AccessibilityEndToEndTest#testPackageNameCannotBeFaked
cts-tradefed run cts -m CtsAccessibilityServiceTestCases
cts-tradefed run cts -m CtsAccessibilityTestCases
bug:
69981755
Change-Id: I13304efbee10d1affa087e9c8bc4ec237643283e
Tor Norbye [Sat, 9 Dec 2017 15:10:47 +0000 (15:10 +0000)]
Merge "Switch @IntDef from long to int, and add @LongDef"
Jorim Jaggi [Sat, 9 Dec 2017 14:23:37 +0000 (14:23 +0000)]
Merge "Lock free animations (1/2)"
Jorim Jaggi [Fri, 20 Oct 2017 13:47:51 +0000 (15:47 +0200)]
Lock free animations (1/2)
First CL that introduces SurfaceAnimator/LockFreeAnimator
We start our synchronized app transition journey by showing that
the concept works by using WindowState animations as proof of
concept.
The main class in this CL are SurfaceAnimator and
SurfaceAnimatorRunner. When we start an animation on a Window, we
create a new bufferless surface, called "The Leash", in the
hierarchy and attach the surface of WindowState onto it, while
attaching the leash onto the old surface parent which is still
responsible for z-layering.
Then, we pass off the Leash into SurfaceAnimationRunner, which then
changes the surface properties of Leash in every animation frame,
without holding the WM lock. While it's doing that we can still
update the z-layering of the window, or even relayout the window
of needed - the important surfaces for this are still under WM's
control.
In case the animation is finished the window surface gets
reparented to its original parent, and the leash is abandoned.
Note that the reparenting is done in the same transaction as
processing the animation finish, such that we don't end up with
a flicker in case of a disappearing animation, where the window
surface gets destroyed.
In case the animation needs to be cancelled, WM can revoke control
of the leash by reparenting the window surface. Even if the
cancellation signal is heavily delayed, WM immediately regains
control over the surface by reparenting it within a transaction.
We also introduce the concept of animating a WindowContainer. We
clean up isAnimating:
- isLocalAnimating: is the container itself animating
- isAnimating: is the container or one of its parents animating
- isSelfOrChildAnimating: is local animating or any child
animating.
SurfaceAnimationRunner also needs it's own thread so it's not getting
bogged down by any WM lock contention by processing regular
animation frames. We call that thread android.anim.lf (lockfree).
Now, imagine that SurfaceAnimationAnimator would sit behind an IPC in
another process and instead of animating WindowState, we'd animate
AppWindowToken. Then, synchronized app transitions would be done.
Test: go/wm-smoke
Test: SurfaceAnimatorTest
Test: SurfaceAnimationRunnerTest
Test: WindowContainerTests
Bug:
64674361
Change-Id: I10d41f7a289ab2158da3f2f1c3ddd78edd1efc86
Exempt-From-Owner-Approval: Tiny change unrelated to display management.
Nicolas Geoffray [Sat, 9 Dec 2017 14:08:18 +0000 (14:08 +0000)]
Merge "Revert "Remove empty ScopedArray constructor."" am:
f6a0a7491b am:
73fce7397e
am:
d3e197a1bd
Change-Id: Idf3497ce71c0a03ed440bb35c09f5247a977f6ba
Nicolas Geoffray [Sat, 9 Dec 2017 13:56:54 +0000 (13:56 +0000)]
Merge "Revert "Remove empty ScopedArray constructor."" am:
f6a0a7491b
am:
73fce7397e
Change-Id: I8bb88e7b91928ae8fc79233a74fe545aa3d40bb7
Nicolas Geoffray [Sat, 9 Dec 2017 13:38:43 +0000 (13:38 +0000)]
Merge "Revert "Remove empty ScopedArray constructor.""
am:
f6a0a7491b
Change-Id: I9c49b4209e98e90bea62ad1656f7405d771395c9
Nicolas Geoffray [Sat, 9 Dec 2017 13:26:00 +0000 (13:26 +0000)]
Merge "Revert "Remove empty ScopedArray constructor.""
Nicolas Geoffray [Sat, 9 Dec 2017 13:25:26 +0000 (13:25 +0000)]
Revert "Remove empty ScopedArray constructor."
Libcore tests still fail.
This reverts commit
cee368b2b8299db5808284a30e2aa14d0aff8b4a.
Change-Id: I4bcdb7bf08d09d563e54cd8fe005402ae3579164
Tor Norbye [Thu, 16 Nov 2017 22:47:04 +0000 (14:47 -0800)]
Switch @IntDef from long to int, and add @LongDef
This CL mirrors changes made to the android.support.annotation version
of IntDef, to keep the usage and semantics identical (though the
internal version of @IntDef and @LongDef are of course hidden and not
part of the SDK.)
Test: These annotations have source retention and therefore have
no runtime impact; the change was compiling the SDK.
Change-Id: Idaf47e8d983c88be1bd8f938615c86611014b45a
Colin Cross [Sat, 9 Dec 2017 04:35:23 +0000 (04:35 +0000)]
Merge "Convert legacy-test, test-runner, and test-mock to Android.bp"
Hugo Benichi [Wed, 6 Dec 2017 04:28:09 +0000 (13:28 +0900)]
DefaultNetworkEvent: fix two bugs with validation times
This patch fixes two bugs around the validation time calculation for
default network metrics:
- for events representing the absence of a default network, the
validation time was not correctly set to 0.
- for events representing a default network, the validation time was
always set to the duration time. This was overlooked by commit
380a0638588d.
Also fix a minor printing padding issue in DefaultNetworkEvent#toString
Test: manually inspected the output of $ adb shell dumpsys connmetrics
while enabling and disabling wifi.
Change-Id: I0eb4ccdf7a61d3097d0661104cb40d738e59772a
Siyuan Zhou [Sat, 9 Dec 2017 03:30:37 +0000 (03:30 +0000)]
Merge "BootReceiver: Added an event log after the dropbox file copy is successful." am:
5323d42b82 am:
c044749416
am:
89df84bfb4 -s ours
Change-Id: Ic5007c1e5bf5153691d3d1cc743c449f7f583bc7
Siyuan Zhou [Sat, 9 Dec 2017 03:18:08 +0000 (03:18 +0000)]
Merge "BootReceiver: Added an event log after the dropbox file copy is successful." am:
5323d42b82
am:
c044749416
Change-Id: If096fea07e31abbd8c5c418c776296c1200009d9
Siyuan Zhou [Sat, 9 Dec 2017 03:06:26 +0000 (03:06 +0000)]
Merge "BootReceiver: Added an event log after the dropbox file copy is successful."
am:
5323d42b82
Change-Id: Iaf53e8a99b61d68c3b920b76c78e9208845c56f3
Treehugger Robot [Sat, 9 Dec 2017 02:55:20 +0000 (02:55 +0000)]
Merge "BootReceiver: Added an event log after the dropbox file copy is successful."
Roshan Pius [Sat, 9 Dec 2017 02:09:51 +0000 (02:09 +0000)]
Merge "Revert "Send empty LinkProperties when entering StoppedState."" am:
e339662247 am:
66c8516600
am:
a312cf38f9
Change-Id: Ib7aff28ca5088bf5ebbc86ab7ee5c607e35d6a2b
Christopher Tate [Sat, 9 Dec 2017 01:52:09 +0000 (17:52 -0800)]
Fix system crash in certain jobs-removed cases
Null happens. Check for it before calling size().
Fixes:
69630116
Test: atest CtsJobSchedulerTestCases
Change-Id: I17ec206946a6a21ff459e2e031cface5499f5264
Roshan Pius [Sat, 9 Dec 2017 01:58:08 +0000 (01:58 +0000)]
Merge "Revert "Send empty LinkProperties when entering StoppedState."" am:
e339662247
am:
66c8516600
Change-Id: I9c7175d9e2db45780f14630db43a6ab5672dfe3d
TreeHugger Robot [Sat, 9 Dec 2017 01:53:11 +0000 (01:53 +0000)]
Merge "Improved AccessibilityNodeInfo.toString()."
Roshan Pius [Sat, 9 Dec 2017 01:48:34 +0000 (01:48 +0000)]
Merge "Revert "Send empty LinkProperties when entering StoppedState.""
am:
e339662247
Change-Id: I402078a9ad6d92441cf34ca0b9459ee51adac984
Tarandeep Singh [Sat, 9 Dec 2017 01:35:04 +0000 (01:35 +0000)]
Merge "Move IME related API methods from IMM to IMS."
Treehugger Robot [Sat, 9 Dec 2017 01:34:07 +0000 (01:34 +0000)]
Merge "Revert "Send empty LinkProperties when entering StoppedState.""
TreeHugger Robot [Sat, 9 Dec 2017 01:10:58 +0000 (01:10 +0000)]
Merge "PROTECTION_FLAG_VENDOR_PRIVILEGED as @TestApi"
Dianne Hackborn [Sat, 9 Dec 2017 01:09:26 +0000 (17:09 -0800)]
Fix issue #
69820174: The size of /proc/meminfo is larger than its stored buffer.
Make it larger.
Bug:
69820174
Test: booted and ran.
Change-Id: Ic0d7db54e9f34b11f81b3b4fcd8cac15753a548c
Holly Jiuyu Sun [Sat, 14 Oct 2017 02:06:34 +0000 (19:06 -0700)]
Carrier confirmation code.
If confirmation code is null and required during downloading a profile,
returns a resovable error, and show ConfirmationCodeActivity. After we
get the confirmation code from the user, continue the operation.
Add the confirmationCode as a member in DownloadableSubscription.
Merged-In: Ibe1e0fc5ddb736b411faf48ec9bea3c68972bb99
Test: unit test, e2e on phone
Bug:
36730837
Change-Id: Ibe1e0fc5ddb736b411faf48ec9bea3c68972bb99
Android Build Merger (Role) [Sat, 9 Dec 2017 00:42:56 +0000 (00:42 +0000)]
Merge "Merge "[AWARE] Make PeerHandle comparable/hashable" am:
8d621cc042 am:
bd82991016 -s ours am:
8b4960ec91 -s ours"
Wale Ogunwale [Sat, 9 Dec 2017 00:40:36 +0000 (00:40 +0000)]
Merge "Use stable rect to determine if we should adjust for IME in split-screen"
Etan Cohen [Sat, 9 Dec 2017 00:40:27 +0000 (00:40 +0000)]
Merge "[AWARE] Make PeerHandle comparable/hashable" am:
8d621cc042 am:
bd82991016 -s ours
am:
8b4960ec91 -s ours
Change-Id: Ic53447dfd6cf026374f9fb9471db8d9d0563ae65
TreeHugger Robot [Sat, 9 Dec 2017 00:35:06 +0000 (00:35 +0000)]
Merge "Add default value for battery app list flag"
Jeff Sharkey [Sat, 9 Dec 2017 00:32:32 +0000 (17:32 -0700)]
Add auto-doc support for @StringDef.
Behaves pretty much the same as @IntDef, but now supports "suffix"
in addition to "prefix" when matching constants.
Test: manual docs output looks sane
Bug:
70406696
Change-Id: I35064b0f9f36f1f13ccdb40302d818a004014f15
Wale Ogunwale [Fri, 8 Dec 2017 18:57:32 +0000 (10:57 -0800)]
Use stable rect to determine if we should adjust for IME in split-screen
Regression was introduced in ag/
3174240 where the content rect used to
be cached before the layout IME so the IME didn't affect the content
rect. However, we don't want content rect to mean something differect
here as content rect excludes the IME space in the rest of the system.
So, changed the one use case we have for this to use stable rect.
Change-Id: I13e23baf87dbcaf21a8e0624f73b9af6116f7262
Fixes:
69425766
Test: Steps from bug
Etan Cohen [Sat, 9 Dec 2017 00:26:47 +0000 (00:26 +0000)]
Merge "[AWARE] Make PeerHandle comparable/hashable" am:
8d621cc042
am:
bd82991016 -s ours
Change-Id: I0d878f4ae7067e875879e683525d20338f2e3405
Xiangyu/Malcolm Chen [Sat, 9 Dec 2017 00:24:40 +0000 (00:24 +0000)]
Merge "Adding cache of IMS provisioned values."