OSDN Git Service
Julia Reynolds [Wed, 9 Aug 2017 14:14:51 +0000 (14:14 +0000)]
Merge "Add logging for what listener canceled notif" into oc-mr1-dev am:
4160fb3eb6
am:
7874b60108
Change-Id: I51857146508c56aba34032ca7841ae308091ba26
Julia Reynolds [Wed, 9 Aug 2017 14:12:40 +0000 (14:12 +0000)]
Merge "dismiss the volume shade if the a11y stream goes away" into oc-mr1-dev am:
9ffb8da752
am:
81427c0e11
Change-Id: I7738fd2d2d2747739aa155cee3c720f206d85534
TreeHugger Robot [Wed, 9 Aug 2017 14:09:17 +0000 (14:09 +0000)]
Merge "Locking changes in ProcessedPackagesJournal"
Pavel Grafov [Wed, 9 Aug 2017 14:02:13 +0000 (14:02 +0000)]
Merge "Mark profile password key as critical." into oc-dr1-dev am:
56385a796e -s ours am:
5ee55e48a5 -s ours
am:
f64d77d5f1 -s ours
Change-Id: I812509d0fb5aa58c2ac9692934040a5585d67095
Erik Kline [Wed, 9 Aug 2017 13:58:49 +0000 (13:58 +0000)]
Merge "Always note the state of RNDIS from USB broadcasts." into oc-dr1-dev am:
07df171ac6 am:
c4b627b7d7
am:
83c2bd5ddd
Change-Id: Ie226534011d6439c24cfe1957c5cf47ba171b0c0
yinxu [Wed, 9 Aug 2017 13:55:54 +0000 (13:55 +0000)]
Merge "Fix the inconsistency of action EUICC_FACTORY_RESET" into oc-dr1-dev am:
669f560338 am:
6b48db9770
am:
47d41c1904
Change-Id: I4d7b78bee03e6fed21e434de5b1b674b389f2bb3
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
Geoffrey Pitsch [Wed, 9 Aug 2017 13:48:11 +0000 (13:48 +0000)]
Merge "Set property that terminates boot anim in WMS instead of SF" into oc-dr1-dev am:
a68ecbfdee am:
ae97c08645
am:
f99c0f4adc
Change-Id: I06055789102e72a3fd6dec05b93d33473b5b3211
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
Andrew Sapperstein [Wed, 9 Aug 2017 13:43:00 +0000 (13:43 +0000)]
Merge "Make accessibilityInversionEnabled public" into oc-dr1-dev am:
3108a06656 am:
264fd594ca
am:
3c813a7e72
Change-Id: Id92ea087d269ad7af8655999f14dc44037cefa50
Lucas Dupin [Wed, 9 Aug 2017 13:39:21 +0000 (13:39 +0000)]
Merge "User avatar didn't have enough contrast" into oc-dr1-dev am:
4cef646e6a am:
39d0042920
am:
35cae7ef1c
Change-Id: I2d72e8dd591a6702e0513e1a9cd5d6b7292f928c
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
Andrii Kulian [Wed, 9 Aug 2017 13:31:16 +0000 (13:31 +0000)]
Merge "Round animation progress for computing size for background" into oc-dr1-dev am:
75176be75a am:
0a01f065a3
am:
ab7223b994
Change-Id: I26cc9808c11d752b7004e5a04bce665410b32a35
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
Glen Kuhne [Wed, 9 Aug 2017 13:27:34 +0000 (13:27 +0000)]
Merge "WifiMetrics: add histogram of connectable networks" into oc-dr1-dev am:
3edc463902 am:
2f55ef1681
am:
05026936a3
Change-Id: Ic939e595651f6d867dc1c226458aba5f6bfd5ba7
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
Wei Wang [Wed, 9 Aug 2017 13:25:03 +0000 (13:25 +0000)]
Merge "Shutdown: Continue shutdown with BLE only mode" into oc-dr1-dev am:
043e60f5e4 am:
1d49ef1d96
am:
28851ef635
Change-Id: I7c95a2b168ef6eb9dbdbbaa897ed119f1ccdd2ff
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
Jason Monk [Wed, 9 Aug 2017 13:16:54 +0000 (13:16 +0000)]
Merge "Fade in rounded corners to avoid abrupt change" into oc-dr1-dev am:
127a4c9014 am:
0a727107a3
am:
18fb8351fe
Change-Id: I125f1f4279d51abcd636eabcbfaf11d922612f1a
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
Sundeep Ghuman [Wed, 9 Aug 2017 13:10:16 +0000 (13:10 +0000)]
Merge "Refactor WifiTracker sStaleScanResults." into oc-dr1-dev am:
e14d59a656 -s ours am:
272e8d9ee7 -s ours
am:
3807e5aae3 -s ours
Change-Id: I9f046657ceb4eb7df8e88bd6b525722890721465
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
Andrii Kulian [Wed, 9 Aug 2017 13:06:38 +0000 (13:06 +0000)]
Merge "Rotate only VR secondary display" into oc-dr1-dev am:
425784eef2 am:
b19383ba80
am:
37e2a82cba
Change-Id: I1422fcb3a53532f85bb0f2310e5523c27a8272e0
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
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
Dan Sandler [Wed, 9 Aug 2017 12:58:57 +0000 (12:58 +0000)]
Merge "DO NOT MERGE: Reduce re-ranking" into oc-dr1-dev am:
ad75ef4c3b am:
8e5bad18d4
am:
1892db4d8d -s ours
Change-Id: I7ec43a0032c0ca1a33ce8724c6f0770b223b71dc
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
Felipe Leme [Wed, 9 Aug 2017 12:56:48 +0000 (12:56 +0000)]
Clarifies autofill lifecycle. am:
744976e298 am:
af40bb0dc4 am:
9457911997
am:
7bf5b6cb58
Change-Id: Id63a96d7c388c69066580163b092d9948c0c8364
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
Jason Monk [Wed, 9 Aug 2017 12:45:03 +0000 (12:45 +0000)]
Merge "Move shutdown UI to sysui (when possible)" into oc-dr1-dev am:
de0c539dd4 am:
561c120990
am:
c56cca354e
Change-Id: Iccbb8f9f5d4c529d5e3d8ccccd3040209aa72fcc
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
Jason Monk [Wed, 9 Aug 2017 12:40:40 +0000 (12:40 +0000)]
Merge "resolve merge conflicts of
de0c539dd4f1 to oc-mr1-dev" into oc-mr1-dev am:
45144930b2
am:
9c6fb7d931
Change-Id: If03f343ac2f10f63db7cae1b848d9790b6b6d8cb
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
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 12:12:59 +0000 (12:12 +0000)]
Merge "Allow ephemeral user creation via createAndManageUser"
Robert Berry [Mon, 17 Jul 2017 08:56:44 +0000 (09:56 +0100)]
Locking changes in ProcessedPackagesJournal
A follow-up CL to apply the code feedback from the first one.
Bug:
36850431
Test: adb shell am instrument -w -e package com.android.server.backup com.android.frameworks.servicestests/android.support.test.runner.AndroidJUnitRunner
Change-Id: I8785eb358658757b329ac871194243c47e6d87a9
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:16:53 +0000 (10:16 +0000)]
Merge "FRP: Fix crash after lockout" into oc-mr1-dev am:
c2ca590e8e
am:
826ec83acb
Change-Id: Iaaf84fab3bfa742c448b7e36b4dfe577b6643d4f
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:42:58 +0000 (09:42 +0000)]
Merge "FRP: Use verifyChallenge instead of verify" into oc-mr1-dev am:
fdd6089aef
am:
7a6ebe3d76
Change-Id: I9091c6e2028fcc347d8f9f9efdd7bdf39fccc1b4
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
Sudheer Shanka [Wed, 9 Aug 2017 06:02:38 +0000 (06:02 +0000)]
Merge "Change logging format in KernelUidCpuFreqTimeReader." into oc-mr1-dev am:
bd9884a331
am:
9107e37ca7
Change-Id: Iabf557628b76c788cce85a33ef4d7d84764e796a
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
Kevin Chyn [Wed, 9 Aug 2017 05:10:12 +0000 (05:10 +0000)]
Merge "Fix fingerprint onEnumerationResult to use remaining instead of fid" into oc-mr1-dev am:
ea783a0905
am:
bbe9d9a40f
Change-Id: Ie88c9c52e9780660a4babf348059c9170a0ce0c7
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:12:24 +0000 (03:12 +0000)]
Merge "WebView: fix SafeBrowsingResponse javadocs" into oc-mr1-dev am:
a9fd746ec6
am:
f93765fc45
Change-Id: I2c507d1e0746125fa77627d9ea5808224f1c865d
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 02:10:22 +0000 (02:10 +0000)]
Merge "Add package use info to dexopt dump" into oc-mr1-dev am:
0c62487d4b
am:
811fdcaefe
Change-Id: Ib7a4f0fb643e27f426195fc8dc11387667e044ac
Makoto Onuki [Wed, 9 Aug 2017 01:51:41 +0000 (01:51 +0000)]
Merge "Intern process names." into oc-mr1-dev am:
a530d79209
am:
3debaa72d4
Change-Id: Iaa2fe2ca2d7680b99f170f2486b3018704e45432
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
Philip P. Moltmann [Wed, 9 Aug 2017 01:43:25 +0000 (01:43 +0000)]
Merge changes from topic 'ClosebySystem' into oc-mr1-dev am:
81021c77c8
am:
560d56500c
Change-Id: I171672bc56b845f87e602c84043ff90b59f25797
Philip P. Moltmann [Wed, 9 Aug 2017 01:41:51 +0000 (01:41 +0000)]
Prevent closing by prev owner after transfer. am:
3306c0d76b
am:
804563c1af
Change-Id: I41f1737c2db17b877fc6bbf7772d18ae708e44e0
Philip P. Moltmann [Wed, 9 Aug 2017 01:40:51 +0000 (01:40 +0000)]
Revert "Revert session-transfer change" am:
7460c5917b
am:
ccf0225c38
Change-Id: I30cc91c765e05e33f9b60005d29ad5f954a2fd23
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
Kevin Chyn [Wed, 9 Aug 2017 01:27:38 +0000 (01:27 +0000)]
Merge "Update FINGERPRINT_ERROR_LOCKOUT documentation" into oc-mr1-dev am:
d952a8b81a
am:
1aefc63ac5
Change-Id: I2e627486c4ed268aabb67aa7a1a892b18ffa21a4
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"
TreeHugger Robot [Wed, 9 Aug 2017 00:50:05 +0000 (00:50 +0000)]
Merge "Remove misleading Location Accuracy comment"
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
Todd Kennedy [Wed, 9 Aug 2017 00:29:17 +0000 (00:29 +0000)]
Merge "Add virtual preload bit to ApplicationInfo" into oc-mr1-dev am:
6bf2990e28
am:
bc0e1e2766
Change-Id: Ie127f827fc1879dcb04f64810ff5c20446e4905a
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
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
Calin Juravle [Tue, 8 Aug 2017 22:57:21 +0000 (22:57 +0000)]
Merge changes from topic 'info-per-split' into oc-mr1-dev am:
df421a8b47
am:
fe8ff8215f
Change-Id: I2ae4dd9455f34a10ddfdb368edd62f048b230d99
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
OSDN Git Service
