OSDN Git Service
Adrian Roos [Wed, 9 Aug 2017 17:10:17 +0000 (17:10 +0000)]
Merge "Merge "LockIcon: update content description when config changes" into oc-dr1-dev am:
f79068637a" into oc-mr1-dev
am:
98af408afd
Change-Id: I6262012fab30014df890bc503adb2b3e04df7480
The Android Open Source Project [Wed, 9 Aug 2017 17:07:59 +0000 (17:07 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
am:
44726df826 -s ours
Change-Id: I2c4f76275bca6bd8841176c2b4629610f7d7feab
Christofer Åkersten [Wed, 9 Aug 2017 17:05:28 +0000 (17:05 +0000)]
Merge "Inherit theme dark/light scheme for MediaRouter dialogs/button" into oc-mr1-dev
am:
8466b0179e
Change-Id: I20d05a76666eeb9e8a720f41f71da120feb6fb46
The Android Open Source Project [Wed, 9 Aug 2017 17:02:00 +0000 (17:02 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
am:
8bcd7a1a5a -s ours
Change-Id: I68ed95539eca795e4a29444e313f91233f4ae4c7
Android Build Merger (Role) [Wed, 9 Aug 2017 16:54:28 +0000 (16:54 +0000)]
Merge "Merge "LockIcon: update content description when config changes" into oc-dr1-dev am:
f79068637a" into oc-mr1-dev
TreeHugger Robot [Wed, 9 Aug 2017 16:51:52 +0000 (16:51 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
Adrian Roos [Wed, 9 Aug 2017 16:51:16 +0000 (16:51 +0000)]
Merge "LockIcon: update content description when config changes" into oc-dr1-dev
am:
f79068637a
Change-Id: I81db081bbc793246ed0e6b7fa2551512c9758ff0
Adrian Roos [Wed, 9 Aug 2017 16:48:26 +0000 (16:48 +0000)]
Merge "BrightnessMirror: When reinflating, notify QSPanel" into oc-dr1-dev am:
1273dd6b86
am:
1067d94353
Change-Id: Ie9a0e3261ff856e8c787cdb6995330f17b91a25f
Christofer Åkersten [Wed, 9 Aug 2017 16:45:51 +0000 (16:45 +0000)]
Merge "Inherit theme dark/light scheme for MediaRouter dialogs/button" into oc-mr1-dev
TreeHugger Robot [Wed, 9 Aug 2017 16:45:34 +0000 (16:45 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
Adrian Roos [Wed, 9 Aug 2017 16:37:30 +0000 (16:37 +0000)]
Merge "BrightnessMirror: When reinflating, notify QSPanel" into oc-dr1-dev
am:
1273dd6b86
Change-Id: I0c561af8d1d7a9213b4f14fcf29d3550672cc92c
TreeHugger Robot [Wed, 9 Aug 2017 16:34:47 +0000 (16:34 +0000)]
Merge "LockIcon: update content description when config changes" into oc-dr1-dev
Jorim Jaggi [Wed, 9 Aug 2017 16:26:23 +0000 (16:26 +0000)]
Merge "Fix out-of-order transactions (1/2)" into oc-dr1-dev am:
cadfccbc13
am:
63f68c7eae
Change-Id: Idb14aa4c3f80713f102549b49d5228bdb19670ef
The Android Open Source Project [Wed, 9 Aug 2017 16:24:12 +0000 (16:24 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am:
9dbd07ef32 -s ours
am:
87ed2a3a15 -s ours
Change-Id: I0c10eb2c228c14d458ca7d97342f219308ef4d4b
TreeHugger Robot [Wed, 9 Aug 2017 16:22:29 +0000 (16:22 +0000)]
Merge "BrightnessMirror: When reinflating, notify QSPanel" into oc-dr1-dev
Jorim Jaggi [Wed, 9 Aug 2017 16:15:53 +0000 (16:15 +0000)]
Merge "Fix out-of-order transactions (1/2)" into oc-dr1-dev
am:
cadfccbc13
Change-Id: Ia4c62e890f007c43b7fa0fd557b583ee455a1e3b
The Android Open Source Project [Wed, 9 Aug 2017 16:12:53 +0000 (16:12 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am:
9dbd07ef32 -s ours
Change-Id: Icec15bf6ba22bcc99d67be38e3967e6f6a227daf
Jorim Jaggi [Wed, 9 Aug 2017 16:10:35 +0000 (16:10 +0000)]
Merge "Fix out-of-order transactions (1/2)" into oc-dr1-dev
TreeHugger Robot [Wed, 9 Aug 2017 15:59:32 +0000 (15:59 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
Todd Kennedy [Wed, 9 Aug 2017 15:05:44 +0000 (15:05 +0000)]
Merge "Allow applications to define failure handlers" into oc-mr1-dev
am:
e551d361ac
Change-Id: I5c325e4bef2274d35fec3a0653043745383c77b6
TreeHugger Robot [Wed, 9 Aug 2017 14:55:09 +0000 (14:55 +0000)]
Merge "Allow applications to define failure handlers" into oc-mr1-dev
Evan Laird [Wed, 9 Aug 2017 14:38:56 +0000 (14:38 +0000)]
Merge "Update X, -, + icons in dnd panel" into oc-dr1-dev am:
6b0c1604a6
am:
09ba6909ab
Change-Id: I74d52e0dc4aaf628173515e5a8a29e24ea2675a5
Evan Laird [Wed, 9 Aug 2017 14:24:39 +0000 (14:24 +0000)]
Merge "Update X, -, + icons in dnd panel" into oc-dr1-dev
am:
6b0c1604a6
Change-Id: I400f6c493469bc775bce9ef903fd496a33524a74
TreeHugger Robot [Wed, 9 Aug 2017 14:13:15 +0000 (14:13 +0000)]
Merge "Update X, -, + icons in dnd panel" into oc-dr1-dev
Adrian Roos [Wed, 9 Aug 2017 13:50:00 +0000 (15:50 +0200)]
LockIcon: update content description when config changes
Fixes a stale content description after a configuration change.
Change-Id: Ie666d405417ce47cc0fc550b79a948425565162d
Fixes:
64234917
Test: Change language, verify content description of lock icon is updated.
Julia Reynolds [Wed, 9 Aug 2017 13:49:45 +0000 (13:49 +0000)]
Merge "Add logging for what listener canceled notif" into oc-mr1-dev
am:
4160fb3eb6
Change-Id: I7dfe8b2a1513da7c3009d8a989470deb16fb0811
Julia Reynolds [Wed, 9 Aug 2017 13:46:19 +0000 (13:46 +0000)]
Merge "dismiss the volume shade if the a11y stream goes away" into oc-mr1-dev
am:
9ffb8da752
Change-Id: I9be5eb42f0edb2f633c32b60f745eeeb139cb062
Pavel Grafov [Wed, 9 Aug 2017 13:43:09 +0000 (13:43 +0000)]
Merge "Mark profile password key as critical." into oc-dr1-dev am:
56385a796e -s ours
am:
5ee55e48a5 -s ours
Change-Id: I149604f760a00b5a524d0954dc43fbd62be47b10
Erik Kline [Wed, 9 Aug 2017 13:34:41 +0000 (13:34 +0000)]
Merge "Always note the state of RNDIS from USB broadcasts." into oc-dr1-dev am:
07df171ac6
am:
c4b627b7d7
Change-Id: I317b694c3a8c76077c031c4410d5b97ed79c1bbc
yinxu [Wed, 9 Aug 2017 13:32:29 +0000 (13:32 +0000)]
Merge "Fix the inconsistency of action EUICC_FACTORY_RESET" into oc-dr1-dev am:
669f560338
am:
6b48db9770
Change-Id: Ib4b10cf44301d0246e0fa252c23529785ac33346
Geoffrey Pitsch [Wed, 9 Aug 2017 13:29:40 +0000 (13:29 +0000)]
Merge "Set property that terminates boot anim in WMS instead of SF" into oc-dr1-dev am:
a68ecbfdee
am:
ae97c08645
Change-Id: I50465733fd410b6d061d043ad6371c300b7a9527
TreeHugger Robot [Wed, 9 Aug 2017 13:28:07 +0000 (13:28 +0000)]
Merge "Add logging for what listener canceled notif" into oc-mr1-dev
TreeHugger Robot [Wed, 9 Aug 2017 13:27:31 +0000 (13:27 +0000)]
Merge "dismiss the volume shade if the a11y stream goes away" into oc-mr1-dev
Andrew Sapperstein [Wed, 9 Aug 2017 13:26:20 +0000 (13:26 +0000)]
Merge "Make accessibilityInversionEnabled public" into oc-dr1-dev am:
3108a06656
am:
264fd594ca
Change-Id: I8fd65434b9b5118f6060e7e12029fe3eaae370f2
Pavel Grafov [Wed, 9 Aug 2017 13:22:29 +0000 (13:22 +0000)]
Merge "Mark profile password key as critical." into oc-dr1-dev
am:
56385a796e -s ours
Change-Id: I8214883676ad022933becca76a704340558abcb1
Lucas Dupin [Wed, 9 Aug 2017 13:20:01 +0000 (13:20 +0000)]
Merge "User avatar didn't have enough contrast" into oc-dr1-dev am:
4cef646e6a
am:
39d0042920
Change-Id: Iafabe12ac226f988f13f41ff3fbef59a55ab7f10
Erik Kline [Wed, 9 Aug 2017 13:17:25 +0000 (13:17 +0000)]
Merge "Always note the state of RNDIS from USB broadcasts." into oc-dr1-dev
am:
07df171ac6
Change-Id: I5958635d612a2c23e8d96e38e75eff2f29ff5e28
Andrii Kulian [Wed, 9 Aug 2017 13:17:11 +0000 (13:17 +0000)]
Merge "Round animation progress for computing size for background" into oc-dr1-dev am:
75176be75a
am:
0a01f065a3
Change-Id: I3d4a7b5eba0da4defcc11c76cf67c778f4638087
yinxu [Wed, 9 Aug 2017 13:15:12 +0000 (13:15 +0000)]
Merge "Fix the inconsistency of action EUICC_FACTORY_RESET" into oc-dr1-dev
am:
669f560338
Change-Id: Ia5f2a3273a09fe457ef913fb8c0d37791b52bf68
Glen Kuhne [Wed, 9 Aug 2017 13:14:28 +0000 (13:14 +0000)]
Merge "WifiMetrics: add histogram of connectable networks" into oc-dr1-dev am:
3edc463902
am:
2f55ef1681
Change-Id: I59e788907d0a641e22d9b9754db8e35e512a222a
Geoffrey Pitsch [Wed, 9 Aug 2017 13:10:55 +0000 (13:10 +0000)]
Merge "Set property that terminates boot anim in WMS instead of SF" into oc-dr1-dev
am:
a68ecbfdee
Change-Id: Id98f4e550b90c128765c0ca014eda925b3507110
Wei Wang [Wed, 9 Aug 2017 13:10:01 +0000 (13:10 +0000)]
Merge "Shutdown: Continue shutdown with BLE only mode" into oc-dr1-dev am:
043e60f5e4
am:
1d49ef1d96
Change-Id: I5401d42d3087e003c8e5cffd18e61860dc67d90f
Andrew Sapperstein [Wed, 9 Aug 2017 13:06:21 +0000 (13:06 +0000)]
Merge "Make accessibilityInversionEnabled public" into oc-dr1-dev
am:
3108a06656
Change-Id: Ic37ee35914b714144228b77b192edf835bf9627e
Jason Monk [Wed, 9 Aug 2017 13:05:10 +0000 (13:05 +0000)]
Merge "Fade in rounded corners to avoid abrupt change" into oc-dr1-dev am:
127a4c9014
am:
0a727107a3
Change-Id: I0e868a90975f4fa96e2ab2379a91888226cf551d
Adrian Roos [Wed, 9 Aug 2017 12:34:55 +0000 (14:34 +0200)]
BrightnessMirror: When reinflating, notify QSPanel
Fixes an issue where after reinflating the brightness mirror,
the QSPanel was not notified.
Change-Id: I3974f31c2d3c67b5a283b10690cb103ca13fff6a
Fixes:
64460731
Test: Change to white / black wallpaper (opposite of current); verify brightness slider works.
Lucas Dupin [Wed, 9 Aug 2017 13:03:29 +0000 (13:03 +0000)]
Merge "User avatar didn't have enough contrast" into oc-dr1-dev
am:
4cef646e6a
Change-Id: Ic5b812965d239de88c98beab411ea5752ec38252
Sundeep Ghuman [Wed, 9 Aug 2017 13:01:14 +0000 (13:01 +0000)]
Merge "Refactor WifiTracker sStaleScanResults." into oc-dr1-dev am:
e14d59a656 -s ours
am:
272e8d9ee7 -s ours
Change-Id: Iffff4fa3b704e248db365b3c09739d3f134ecf43
Andrii Kulian [Wed, 9 Aug 2017 12:59:51 +0000 (12:59 +0000)]
Merge "Round animation progress for computing size for background" into oc-dr1-dev
am:
75176be75a
Change-Id: I7c018b5eadc66db0d91542e089899123a85a8877
Andrii Kulian [Wed, 9 Aug 2017 12:58:55 +0000 (12:58 +0000)]
Merge "Rotate only VR secondary display" into oc-dr1-dev am:
425784eef2
am:
b19383ba80
Change-Id: Ic5edbc7feea4f99d63360c076569839f574ad056
Glen Kuhne [Wed, 9 Aug 2017 12:56:05 +0000 (12:56 +0000)]
Merge "WifiMetrics: add histogram of connectable networks" into oc-dr1-dev
am:
3edc463902
Change-Id: I575446562bfb560ace060300afb828fc52c4201d
Wei Wang [Wed, 9 Aug 2017 12:53:13 +0000 (12:53 +0000)]
Merge "Shutdown: Continue shutdown with BLE only mode" into oc-dr1-dev
am:
043e60f5e4
Change-Id: I51722b281ab9badaefd705500aa9a36d2e2d6f91
Dan Sandler [Wed, 9 Aug 2017 12:49:55 +0000 (12:49 +0000)]
Merge "DO NOT MERGE: Reduce re-ranking" into oc-dr1-dev am:
ad75ef4c3b
am:
8e5bad18d4
Change-Id: I63abb60059f274be1fc123a2d802769782e70a13
Jason Monk [Wed, 9 Aug 2017 12:47:07 +0000 (12:47 +0000)]
Merge "Fade in rounded corners to avoid abrupt change" into oc-dr1-dev
am:
127a4c9014
Change-Id: I943db8a557e311d845b9550a52dda8d286864cf6
Felipe Leme [Wed, 9 Aug 2017 12:45:33 +0000 (12:45 +0000)]
Clarifies autofill lifecycle. am:
744976e298 am:
af40bb0dc4
am:
9457911997
Change-Id: I940da9119dc9d07789cc7028dc7b9119082454ad
Sundeep Ghuman [Wed, 9 Aug 2017 12:41:25 +0000 (12:41 +0000)]
Merge "Refactor WifiTracker sStaleScanResults." into oc-dr1-dev
am:
e14d59a656 -s ours
Change-Id: I18e7f77e4a58ed8abe288aa04b762d112ae495b2
Andrii Kulian [Wed, 9 Aug 2017 12:38:54 +0000 (12:38 +0000)]
Merge "Rotate only VR secondary display" into oc-dr1-dev
am:
425784eef2
Change-Id: I2a5acd51bd9ea588823844cd6a49716181e717a9
Jorim Jaggi [Tue, 8 Aug 2017 13:12:20 +0000 (15:12 +0200)]
Fix out-of-order transactions (1/2)
The following sequence of order may happen which cause wrong
surface positions:
- WA.animate updates surfaces properties to S
- WA.animate closes the surface transaction
- Since the previous animation transaction wasn't commited yet,
closeSurfaceTransaction blocks and updating the surface properties
on SF side is deferred.
- In the meantime, since we are not holding WM lock, we have
another thread updating surfaces properties to S'
- Closing the transaction in this thread completes immediately
because it's not a synchronous transaction or animation
transaction.
- After a frame has been processed S gets applied on SF side as
the other transaction is done waiting for the frame to complete.
The issue here is that properties are now set to S instead of S'.
Sad!
We originally started calling closeTransaction without the WM
lock being held because it lead to thread starvation (b/
38192114).
However, that fix has this big flaw as described above.
To fix this, we create an empty animation transaction before
updating the animation properties to simulate the back-pressuring
behavior of animation transactions without the WM lock being held.
If that transaction arrives out of order, it doesn't matter at all
because it is empty.
After that, we perform the animation udpate in a transaction that
is not marked as an animation transaction, and thus will not
block, which avoids the starvation issue.
Part of this change is also a change in SF to allow executing
empty animation transactions.
Test: go/wm-smoke
Test: Open VideoPlayer from VRCore, close it, observe no wrong
positiioning of surfaces.
Test: Inspect traces while animating. Ensure back pressuring still
works.
Change-Id: Ie545463e71e0d1bc73439d14381077a290d2f959
Fixes:
63905190
Bug:
38192114
Jason Monk [Wed, 9 Aug 2017 12:35:53 +0000 (12:35 +0000)]
Merge "Move shutdown UI to sysui (when possible)" into oc-dr1-dev am:
de0c539dd4
am:
561c120990
Change-Id: Ic08f3df60f2609bf25b0112a43c3186e1de02b10
Dan Sandler [Wed, 9 Aug 2017 12:33:07 +0000 (12:33 +0000)]
Merge "DO NOT MERGE: Reduce re-ranking" into oc-dr1-dev
am:
ad75ef4c3b
Change-Id: I53055ed426d65a6214d19ef11b6f6540c7f6d94c
Felipe Leme [Wed, 9 Aug 2017 12:30:16 +0000 (12:30 +0000)]
Clarifies autofill lifecycle. am:
744976e298
am:
af40bb0dc4
Change-Id: I48f797f62c120b352045cb93e5067ee20c3154d3
Jason Monk [Wed, 9 Aug 2017 12:29:41 +0000 (12:29 +0000)]
Merge "resolve merge conflicts of
de0c539dd4f1 to oc-mr1-dev" into oc-mr1-dev
am:
45144930b2
Change-Id: Idb6ca3b703653a3f7d6e07b54789cb67a3ab910a
Jason Monk [Wed, 9 Aug 2017 12:15:19 +0000 (12:15 +0000)]
Merge "resolve merge conflicts of
de0c539dd4f1 to oc-mr1-dev" into oc-mr1-dev
TreeHugger Robot [Wed, 9 Aug 2017 10:17:09 +0000 (10:17 +0000)]
Merge "Mark profile password key as critical." into oc-dr1-dev
Adrian Roos [Wed, 9 Aug 2017 10:05:49 +0000 (10:05 +0000)]
Merge "FRP: Fix crash after lockout" into oc-mr1-dev
am:
c2ca590e8e
Change-Id: I9191e85e58094d0326bf3b36c290e8b92e23dbd2
Adrian Roos [Wed, 9 Aug 2017 09:54:22 +0000 (09:54 +0000)]
Merge "FRP: Fix crash after lockout" into oc-mr1-dev
Adrian Roos [Wed, 9 Aug 2017 09:32:19 +0000 (09:32 +0000)]
Merge "FRP: Use verifyChallenge instead of verify" into oc-mr1-dev
am:
fdd6089aef
Change-Id: I5ab8540c1cbf9bab803877903af14f4560001de6
TreeHugger Robot [Wed, 9 Aug 2017 09:19:15 +0000 (09:19 +0000)]
Merge "FRP: Use verifyChallenge instead of verify" into oc-mr1-dev
Pavel Grafov [Tue, 8 Aug 2017 15:53:32 +0000 (16:53 +0100)]
Mark profile password key as critical.
Currently it is erased when keystore for user 0 is cleared, e.g.
when the user clears data for Settings app.
Bug:
35929605
Bug:
64467610
Test: Manually cleared Settings data.
Test: Manually cleared credentials from Settings.
Change-Id: I7e8753a1bf53f5d68d4738a4eb84faa890f026cc
Merged-In: I7e8753a1bf53f5d68d4738a4eb84faa890f026cc
The Android Open Source Project [Wed, 9 Aug 2017 07:54:18 +0000 (00:54 -0700)]
Import translations. DO NOT MERGE
Change-Id: I02e4b572c91641f5d61321bd3248081723ad65ab
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Christofer Åkersten [Mon, 7 Aug 2017 09:56:52 +0000 (18:56 +0900)]
Inherit theme dark/light scheme for MediaRouter dialogs/button
Bug:
64291950
Test: manual
Change-Id: I20694ce512a794a3c6574108b80dcfb4979b3b39
Sudheer Shanka [Wed, 9 Aug 2017 05:51:02 +0000 (05:51 +0000)]
Merge "Change logging format in KernelUidCpuFreqTimeReader." into oc-mr1-dev
am:
bd9884a331
Change-Id: I0ce73c459ff188dd3ace6480fa02d2e6aaab85f2
Sudheer Shanka [Wed, 9 Aug 2017 05:38:18 +0000 (05:38 +0000)]
Merge "Change logging format in KernelUidCpuFreqTimeReader." into oc-mr1-dev
The Android Open Source Project [Wed, 9 Aug 2017 05:12:23 +0000 (22:12 -0700)]
Import translations. DO NOT MERGE
Change-Id: I81ed1424d6624e47c0ce1bfd095aa3c8bfada2df
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Kevin Chyn [Wed, 9 Aug 2017 04:58:04 +0000 (04:58 +0000)]
Merge "Fix fingerprint onEnumerationResult to use remaining instead of fid" into oc-mr1-dev
am:
ea783a0905
Change-Id: I5748eadc6b2ce46a5c525db76ae9b449ae4dafa8
TreeHugger Robot [Wed, 9 Aug 2017 04:42:05 +0000 (04:42 +0000)]
Merge "Fix fingerprint onEnumerationResult to use remaining instead of fid" into oc-mr1-dev
Erik Kline [Wed, 9 Aug 2017 03:43:31 +0000 (03:43 +0000)]
Merge "Always note the state of RNDIS from USB broadcasts." into oc-dr1-dev
Nate Fischer [Wed, 9 Aug 2017 03:01:59 +0000 (03:01 +0000)]
Merge "WebView: fix SafeBrowsingResponse javadocs" into oc-mr1-dev
am:
a9fd746ec6
Change-Id: I06f63b0866825a52da8dcd5d2492525e5c62a39f
Nate Fischer [Wed, 9 Aug 2017 02:52:53 +0000 (02:52 +0000)]
Merge "WebView: fix SafeBrowsingResponse javadocs" into oc-mr1-dev
Calin Juravle [Wed, 9 Aug 2017 01:47:46 +0000 (01:47 +0000)]
Merge "Add package use info to dexopt dump" into oc-mr1-dev
am:
0c62487d4b
Change-Id: Ie3d32c487a19a44e4a4bdf2d071b6ae297f25bae
Calin Juravle [Wed, 9 Aug 2017 01:35:23 +0000 (01:35 +0000)]
Merge "Add package use info to dexopt dump" into oc-mr1-dev
Makoto Onuki [Wed, 9 Aug 2017 01:31:03 +0000 (01:31 +0000)]
Merge "Intern process names." into oc-mr1-dev
am:
a530d79209
Change-Id: I84c2c6cec01add83511fef717960f79eb7a763b9
Philip P. Moltmann [Wed, 9 Aug 2017 01:14:26 +0000 (01:14 +0000)]
Merge changes from topic 'ClosebySystem' into oc-mr1-dev
am:
81021c77c8
Change-Id: I74a060fb30453c34533fbe7bd240803c80bf63f5
Philip P. Moltmann [Wed, 9 Aug 2017 01:13:33 +0000 (01:13 +0000)]
Prevent closing by prev owner after transfer.
am:
3306c0d76b
Change-Id: I8c033bbfda3177467878b6a456a790237730634d
Philip P. Moltmann [Wed, 9 Aug 2017 01:11:49 +0000 (01:11 +0000)]
Revert "Revert session-transfer change"
am:
7460c5917b
Change-Id: I9f7927993fb3166cc6aeca751dd97aebc277a5db
TreeHugger Robot [Wed, 9 Aug 2017 01:10:03 +0000 (01:10 +0000)]
Merge "Intern process names." into oc-mr1-dev
TreeHugger Robot [Wed, 9 Aug 2017 01:01:11 +0000 (01:01 +0000)]
Merge changes from topic 'ClosebySystem' into oc-mr1-dev
* changes:
Allow to close session from wrong context.
Prevent closing by prev owner after transfer.
Revert "Revert session-transfer change"
Kevin Chyn [Wed, 9 Aug 2017 00:45:22 +0000 (00:45 +0000)]
Merge "Update FINGERPRINT_ERROR_LOCKOUT documentation" into oc-mr1-dev
am:
d952a8b81a
Change-Id: I30c3a2c7a633e3e0201d966c4cc6f5d406a5c1a8
TreeHugger Robot [Wed, 9 Aug 2017 00:41:25 +0000 (00:41 +0000)]
Merge "Fix the inconsistency of action EUICC_FACTORY_RESET" into oc-dr1-dev
TreeHugger Robot [Wed, 9 Aug 2017 00:28:50 +0000 (00:28 +0000)]
Merge "Set property that terminates boot anim in WMS instead of SF" into oc-dr1-dev
TreeHugger Robot [Wed, 9 Aug 2017 00:22:01 +0000 (00:22 +0000)]
Merge "Update FINGERPRINT_ERROR_LOCKOUT documentation" into oc-mr1-dev
The Android Open Source Project [Wed, 9 Aug 2017 00:14:59 +0000 (17:14 -0700)]
Import translations. DO NOT MERGE
Change-Id: I8720da8cd27dd431d0428aac436e75b7fe04b677
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
TreeHugger Robot [Wed, 9 Aug 2017 00:00:27 +0000 (00:00 +0000)]
Merge "Make accessibilityInversionEnabled public" into oc-dr1-dev
Todd Kennedy [Tue, 8 Aug 2017 23:58:02 +0000 (23:58 +0000)]
Merge "Add virtual preload bit to ApplicationInfo" into oc-mr1-dev
am:
6bf2990e28
Change-Id: Ia860bf5f5fc6b5851f076960e8228952f733e3ba
TreeHugger Robot [Tue, 8 Aug 2017 23:33:03 +0000 (23:33 +0000)]
Merge "Add virtual preload bit to ApplicationInfo" into oc-mr1-dev
Lucas Dupin [Tue, 8 Aug 2017 23:03:31 +0000 (23:03 +0000)]
Merge "User avatar didn't have enough contrast" into oc-dr1-dev
TreeHugger Robot [Tue, 8 Aug 2017 22:55:33 +0000 (22:55 +0000)]
Merge "Round animation progress for computing size for background" into oc-dr1-dev
Sudheer Shanka [Tue, 8 Aug 2017 22:44:09 +0000 (15:44 -0700)]
Change logging format in KernelUidCpuFreqTimeReader.
TimeUtils.formatForLogging takes currentTimeMillis as
argument, not elapsedRealTime.
Bug:
63041570
Test: visual inspection of logs
Change-Id: I4b880f64a8ead9a6a4a37fa4b9691edfc38a12db
TreeHugger Robot [Tue, 8 Aug 2017 22:46:50 +0000 (22:46 +0000)]
Merge "WifiMetrics: add histogram of connectable networks" into oc-dr1-dev
Nate Fischer [Thu, 27 Jul 2017 19:33:55 +0000 (12:33 -0700)]
WebView: fix SafeBrowsingResponse javadocs
Docs change only.
This fixes javadoc errors in SafeBrowsingResponse.java:
* Typo: capital "B" in "onSafeBrowsingHit"
* Add full package names
* Add parameter lists to all linked methods
Bug:
64077668
Test: make update-api and check javadocs manually
Change-Id: I5e7b0e59ba865619b252f7e9e431ffac6e1bab1f
Calin Juravle [Tue, 8 Aug 2017 22:35:01 +0000 (22:35 +0000)]
Merge changes from topic 'info-per-split' into oc-mr1-dev
am:
df421a8b47
Change-Id: I76e4499cf3ca4506f59f6c80c0f20faeda90f3e6
OSDN Git Service
