git.osdn.net Git - android-x86/frameworks-base.git/log

Nathan Harold [Thu, 22 Mar 2018 19:41:01 +0000 (19:41 +0000)]

[automerger skipped]Merge "Add NonNull Annotations To IpSec API Surface" into pi-dev am: 33ed612cca -s ours
am: 8033a03f9c -s ours

Change-Id: I85f74c4687a54243ccdf290c0a011745623fb040

commit | commitdiff | tree

Makoto Onuki [Thu, 22 Mar 2018 19:15:02 +0000 (19:15 +0000)]

Merge "Move provider access stats to frameworks/base" into pi-dev am: c7f6eadffc
am: 3a6af5133e

Change-Id: Ia7ec47f226e74bc65856a80c2f30ba604930962b

commit | commitdiff | tree

Nathan Harold [Thu, 22 Mar 2018 19:11:11 +0000 (19:11 +0000)]

[automerger skipped]Merge "Add NonNull Annotations To IpSec API Surface" into pi-dev
am: 33ed612cca -s ours

Change-Id: Ieca39ff6788ca7293ff95516120b947e502f4085

commit | commitdiff | tree

Tej Singh [Thu, 22 Mar 2018 19:06:10 +0000 (19:06 +0000)]

[automerger skipped]Merge "[automerger skipped]Merge "Dummy StatsLog class" into stage-aosp-master am: fe5fdb1213 -s ours" into pi-dev-plus-aosp
am: d244048264 -s ours

Change-Id: I4a8f5f08da5ebc6daf9728ace8a7fd1843c20895

commit | commitdiff | tree

Chong Zhang [Thu, 22 Mar 2018 18:54:57 +0000 (18:54 +0000)]

Merge "heif: fix Exif extraction in mtp database" into pi-dev am: 9e64c01d02
am: a60c81cf0d

Change-Id: Ic3d4c958745ec68d4480a637c46eb252c3dac4d5

commit | commitdiff | tree

Felipe Leme [Thu, 22 Mar 2018 18:48:27 +0000 (18:48 +0000)]

Merge "Don't allow null ids on FillResponse.Builder.setAuthentication()" into pi-dev am: de6dfd93e5
am: a14992b585

Change-Id: I00f8979ad1a686413b34a4d1f150a467949c55bc

commit | commitdiff | tree

Makoto Onuki [Thu, 22 Mar 2018 18:45:31 +0000 (18:45 +0000)]

Merge "Move provider access stats to frameworks/base" into pi-dev
am: c7f6eadffc

Change-Id: I22451d7234f52332ddd5e4811f9fe9b957469265

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 22 Mar 2018 18:38:24 +0000 (18:38 +0000)]

Merge "[automerger skipped]Merge "Dummy StatsLog class" into stage-aosp-master am: fe5fdb1213 -s ours" into pi-dev-plus-aosp

commit | commitdiff | tree

Tej Singh [Thu, 22 Mar 2018 18:37:59 +0000 (18:37 +0000)]

[automerger skipped]Merge "Dummy StatsLog class" into stage-aosp-master
am: fe5fdb1213 -s ours

Change-Id: I6b5a02d285536a5a4433aa4060e72cb7acd16e35

commit | commitdiff | tree

Felipe Leme [Thu, 22 Mar 2018 18:37:16 +0000 (18:37 +0000)]

Merge "Fixed autofill service metadata name on javadoc sample." into pi-dev am: b030730aa8
am: 949d293ed2

Change-Id: I3554d6033b19a0139b7d8f3a680be68d8b900d59

commit | commitdiff | tree

Chong Zhang [Thu, 22 Mar 2018 18:36:24 +0000 (18:36 +0000)]

Merge "heif: fix Exif extraction in mtp database" into pi-dev
am: 9e64c01d02

Change-Id: Ied34169a586b99b8833db8946f8e64409f2b79cd

commit | commitdiff | tree

Bo Zhu [Thu, 22 Mar 2018 18:32:35 +0000 (18:32 +0000)]

Merge "Remove the hard-coded counterId in VaultParams" into pi-dev am: 88956ce326
am: c79c9b1cb2

Change-Id: I8866fc1844ba349694ae0652752719260b820132

commit | commitdiff | tree

Nathan Harold [Thu, 22 Mar 2018 18:31:03 +0000 (18:31 +0000)]

Merge "Add NonNull Annotations To IpSec API Surface" into pi-dev

commit | commitdiff | tree

Felipe Leme [Thu, 22 Mar 2018 18:28:41 +0000 (18:28 +0000)]

Merge "Don't allow null ids on FillResponse.Builder.setAuthentication()" into pi-dev
am: de6dfd93e5

Change-Id: If5937a6d59d7e386aa685570359df47cb34a8a98

commit | commitdiff | tree

Tej Singh [Thu, 22 Mar 2018 18:23:52 +0000 (18:23 +0000)]

Merge "Dummy StatsLog class" into stage-aosp-master

commit | commitdiff | tree

Felipe Leme [Thu, 22 Mar 2018 18:23:06 +0000 (18:23 +0000)]

Merge "Fixed autofill service metadata name on javadoc sample." into pi-dev
am: b030730aa8

Change-Id: Ic8c2eff923157be306dd401e47979a3337499919

commit | commitdiff | tree

Bo Zhu [Thu, 22 Mar 2018 18:19:09 +0000 (18:19 +0000)]

Merge "Remove the hard-coded counterId in VaultParams" into pi-dev
am: 88956ce326

Change-Id: I9112e639ae556de60cc2da64eef283033e99cca6

commit | commitdiff | tree

Robert Berry [Thu, 22 Mar 2018 18:13:14 +0000 (18:13 +0000)]

Merge "Unhide RecoveryController#getRootCertificates()" into pi-dev am: c6bd185565
am: be910a789e

Change-Id: I5fdaf507def6a7f679b2ce4569f5787864e31f45

commit | commitdiff | tree

Robert Berry [Thu, 22 Mar 2018 18:07:58 +0000 (18:07 +0000)]

Merge "Unhide RecoverySession#recoverKeyChainSnapshot() method" into pi-dev am: 3818de595b
am: 986afbd959

Change-Id: Id38a53ef38e7d493e715cff747ebd2b0a9880a98

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 22 Mar 2018 17:59:49 +0000 (17:59 +0000)]

Merge "Merge "Make QSTileImpl#mListeners thread safe." into pi-dev am: 3bfa02a114 am: 48dcf157ed"

commit | commitdiff | tree

Amin Shaikh [Thu, 22 Mar 2018 17:59:24 +0000 (17:59 +0000)]

Merge "Make QSTileImpl#mListeners thread safe." into pi-dev am: 3bfa02a114
am: 48dcf157ed

Change-Id: I105bf4aa0e129141281ccb706ccb08e29c99f6b5

commit | commitdiff | tree

Calin Juravle [Thu, 22 Mar 2018 17:58:21 +0000 (17:58 +0000)]

Merge "Add extra checks around the profile file descriptor."

commit | commitdiff | tree

Robert Berry [Thu, 22 Mar 2018 17:50:46 +0000 (17:50 +0000)]

Merge "Unhide RecoveryController#getRootCertificates()" into pi-dev
am: c6bd185565

Change-Id: Ib81d1997ee46034dff4c8b9c45836f434f660f1a

commit | commitdiff | tree

Robert Berry [Thu, 22 Mar 2018 17:45:01 +0000 (17:45 +0000)]

Merge "Unhide RecoverySession#recoverKeyChainSnapshot() method" into pi-dev
am: 3818de595b

Change-Id: Ie3aad7e53a3e359bd83602db3a85cf1ab497e7c2

commit | commitdiff | tree

Makoto Onuki [Thu, 22 Mar 2018 17:42:13 +0000 (17:42 +0000)]

Merge "Move provider access stats to frameworks/base" into pi-dev

commit | commitdiff | tree

Chong Zhang [Thu, 22 Mar 2018 17:39:52 +0000 (17:39 +0000)]

Merge "heif: fix Exif extraction in mtp database" into pi-dev

commit | commitdiff | tree

Amin Shaikh [Thu, 22 Mar 2018 17:37:47 +0000 (17:37 +0000)]

Merge "Make QSTileImpl#mListeners thread safe." into pi-dev
am: 3bfa02a114

Change-Id: Iff73fc24b669ead73d67091805d809c60953e2e2

commit | commitdiff | tree

Felipe Leme [Thu, 22 Mar 2018 17:36:18 +0000 (17:36 +0000)]

Merge "Don't allow null ids on FillResponse.Builder.setAuthentication()" into pi-dev

commit | commitdiff | tree

Felipe Leme [Thu, 22 Mar 2018 17:33:36 +0000 (17:33 +0000)]

Merge "Fixed autofill service metadata name on javadoc sample." into pi-dev

commit | commitdiff | tree

Bo Zhu [Thu, 22 Mar 2018 17:32:10 +0000 (17:32 +0000)]

Merge "Remove the hard-coded counterId in VaultParams" into pi-dev

commit | commitdiff | tree

Robert Berry [Thu, 22 Mar 2018 17:23:05 +0000 (17:23 +0000)]

Merge "Unhide RecoveryController#getRootCertificates()" into pi-dev

commit | commitdiff | tree

Felipe Leme [Thu, 22 Mar 2018 17:19:52 +0000 (17:19 +0000)]

Merge "Renamed AUTOFILL_COMPAT_MODE_ALLOWED_PACKAGES." into pi-dev am: 4e561f83cb
am: 16f6c77d95

Change-Id: Ifce1e7799f71fa1952ab490d5504275b702cf931

commit | commitdiff | tree

Robert Berry [Thu, 22 Mar 2018 17:19:33 +0000 (17:19 +0000)]

Merge "Unhide RecoverySession#recoverKeyChainSnapshot() method" into pi-dev

commit | commitdiff | tree

Fyodor Kupolov [Thu, 22 Mar 2018 17:07:14 +0000 (17:07 +0000)]

Merge "Add OWNERS for GlobalSettingsToPropertiesMapper" into pi-dev am: 8055aa2434
am: c85d3b3e6a

Change-Id: Iaef55ec2eeec59c09499e6e1e99ddcccc143cc8d

commit | commitdiff | tree

TreeHugger Robot [Thu, 22 Mar 2018 17:07:01 +0000 (17:07 +0000)]

Merge "Make QSTileImpl#mListeners thread safe." into pi-dev

commit | commitdiff | tree

Felipe Leme [Thu, 22 Mar 2018 17:05:36 +0000 (17:05 +0000)]

Merge "Renamed AUTOFILL_COMPAT_MODE_ALLOWED_PACKAGES." into pi-dev
am: 4e561f83cb

Change-Id: Id6e661b49cc9a28bb6464930210eac41f061d61a

commit | commitdiff | tree

Mikhail Naganov [Thu, 22 Mar 2018 16:57:05 +0000 (16:57 +0000)]

Merge "Audio presentation: Docs & Testability fixes" into pi-dev am: 397962981c
am: 0056af933e

Change-Id: I588333753dab8f67e14b1521f6695ecbe5920af3

commit | commitdiff | tree

Fyodor Kupolov [Thu, 22 Mar 2018 16:57:02 +0000 (16:57 +0000)]

Merge "Add OWNERS for GlobalSettingsToPropertiesMapper" into pi-dev
am: 8055aa2434

Change-Id: Ia61b7426acef33ac4f19f4fdc133be2a84bbf49d

commit | commitdiff | tree

Mikhail Naganov [Thu, 22 Mar 2018 16:43:54 +0000 (16:43 +0000)]

Merge "Audio presentation: Docs & Testability fixes" into pi-dev
am: 397962981c

Change-Id: I6088df15fd85afd633f1111a7eb675bcd7c9ad95

commit | commitdiff | tree

Wyatt Riley [Thu, 22 Mar 2018 16:33:08 +0000 (16:33 +0000)]

Merge "GNSS Model Name constant string and comment updates" into pi-dev am: aa8cbab151
am: c0b6f1db3e

Change-Id: Ife249a2ce6508299199042b38612df3092c13502

commit | commitdiff | tree

Felipe Leme [Thu, 22 Mar 2018 16:24:53 +0000 (16:24 +0000)]

Merge "Renamed AUTOFILL_COMPAT_MODE_ALLOWED_PACKAGES." into pi-dev

commit | commitdiff | tree

Wyatt Riley [Thu, 22 Mar 2018 16:24:51 +0000 (16:24 +0000)]

Merge "GNSS Model Name constant string and comment updates" into pi-dev
am: aa8cbab151

Change-Id: Idafb74af51dccbfe754f7dfc6a667fa13b310582

commit | commitdiff | tree

Fyodor Kupolov [Thu, 22 Mar 2018 16:21:24 +0000 (16:21 +0000)]

Merge "Add OWNERS for GlobalSettingsToPropertiesMapper" into pi-dev

commit | commitdiff | tree

TreeHugger Robot [Thu, 22 Mar 2018 16:14:19 +0000 (16:14 +0000)]

Merge "Audio presentation: Docs & Testability fixes" into pi-dev

commit | commitdiff | tree

Wyatt Riley [Thu, 22 Mar 2018 16:10:08 +0000 (16:10 +0000)]

Merge "GNSS Model Name constant string and comment updates" into pi-dev

commit | commitdiff | tree

Felipe Leme [Thu, 22 Mar 2018 15:39:09 +0000 (08:39 -0700)]

Fixed autofill service metadata name on javadoc sample.

Bug: 72811034
Test: nope

Change-Id: I0367fa6ad1fa21c51dadb9706830bc50c3139cab

commit | commitdiff | tree

Michael Plass [Thu, 22 Mar 2018 15:31:17 +0000 (15:31 +0000)]

Merge "Add Settings.Global.WIFI_SCORE_PARAMS" into pi-dev am: dddd69ef3e
am: ad35dfa2a1

Change-Id: I62266b86cf0ff8f664a62dd1ee673ce338c8d40e

commit | commitdiff | tree

Michael Plass [Thu, 22 Mar 2018 15:17:30 +0000 (15:17 +0000)]

Merge "Add Settings.Global.WIFI_SCORE_PARAMS" into pi-dev
am: dddd69ef3e

Change-Id: I981b1d4fe36044e47b12051bf0dfd499eea2a155

commit | commitdiff | tree

Michael Plass [Thu, 22 Mar 2018 15:03:51 +0000 (15:03 +0000)]

Merge "Add Settings.Global.WIFI_SCORE_PARAMS" into pi-dev

commit | commitdiff | tree

Makoto Onuki [Wed, 21 Mar 2018 04:22:37 +0000 (21:22 -0700)]

Move provider access stats to frameworks/base

Bug: 76037330
Test: boot and dumpsys activity provider ContactsProvider2
Change-Id: I69cfe0edc98da00d1212f57871646488f87eb8dd

commit | commitdiff | tree

Artem Iglikov [Thu, 22 Mar 2018 14:31:42 +0000 (14:31 +0000)]

[automerger skipped]Merge "DO NOT MERGE Revert "DO NOT MERGE Update references to backup/restore agent timeouts"" into pi-dev am: 3e4df18658
am: 2d05d85da1 -s ours

Change-Id: Ie648f1b6b112d1dcf447024a4eeea0fb49440338

commit | commitdiff | tree

Robert Berry [Thu, 22 Mar 2018 14:25:30 +0000 (14:25 +0000)]

Merge "Small fix for the key grant alias used in importKey" into pi-dev am: f9332469a4
am: 157aee22f5

Change-Id: Ida134803f6c251448ba65cfcc87669c01ea99f2b

commit | commitdiff | tree

Robert Berry [Thu, 22 Mar 2018 14:20:27 +0000 (14:20 +0000)]

Merge "Unhide the new RecoverySession#start with the alias for root cert" into pi-dev am: 98ea60c427
am: 60efe8379d

Change-Id: I5b04c097bb5f26fe031191bcc208db9408f998a3

commit | commitdiff | tree

Artem Iglikov [Thu, 22 Mar 2018 14:20:20 +0000 (14:20 +0000)]

Merge "DO NOT MERGE Revert "DO NOT MERGE Update references to backup/restore agent timeouts"" into pi-dev
am: 3e4df18658

Change-Id: Ic23be0c9e0af0fe9ec153e90950dd4ea3a0bbeac

commit | commitdiff | tree

Robert Berry [Thu, 22 Mar 2018 14:11:56 +0000 (14:11 +0000)]

Merge "Small fix for the key grant alias used in importKey" into pi-dev
am: f9332469a4

Change-Id: I43efcec91dc8c9e84cbefe2b0dcd7a089046cee3

commit | commitdiff | tree

Robert Berry [Thu, 22 Mar 2018 14:06:42 +0000 (14:06 +0000)]

Merge "Unhide the new RecoverySession#start with the alias for root cert" into pi-dev
am: 98ea60c427

Change-Id: Ibd8338f5568478b207e660aaaa03d11bde8fcfeb

commit | commitdiff | tree

TreeHugger Robot [Thu, 22 Mar 2018 14:04:20 +0000 (14:04 +0000)]

Merge "DO NOT MERGE Revert "DO NOT MERGE Update references to backup/restore agent timeouts"" into pi-dev

commit | commitdiff | tree

Robert Berry [Thu, 22 Mar 2018 13:55:31 +0000 (13:55 +0000)]

Merge "Small fix for the key grant alias used in importKey" into pi-dev

commit | commitdiff | tree

Robert Berry [Wed, 21 Mar 2018 16:31:52 +0000 (16:31 +0000)]

Unhide RecoverySession#recoverKeyChainSnapshot() method

The other methods expose raw key materials, which is a security flaw. This
new API is already being used by GMSCore, via reflection (although falling
back to the old methods if it is not available). Would be good to switch it
on ASAP.

Bug: 74345822
Test: Tested with GMSCore
Change-Id: I30d53c9e825888d1122c72d23b7c1c10c6edb1e9

commit | commitdiff | tree

Robert Berry [Wed, 21 Mar 2018 21:57:07 +0000 (21:57 +0000)]

Unhide RecoveryController#getRootCertificates()

This is so we can add a GTS test to affirm that GMS devices include the
Google Cloud Key Vault root certificate.

Test: runtest frameworks-core -p android.security.keystore.recovery
Bug: 74621045
Change-Id: Ib6431f5739f3dff066832e6aa300dd9da5bc0727

commit | commitdiff | tree

Robert Berry [Thu, 22 Mar 2018 13:48:31 +0000 (13:48 +0000)]

Merge "Unhide the new RecoverySession#start with the alias for root cert" into pi-dev

commit | commitdiff | tree

Artem Iglikov [Thu, 22 Mar 2018 12:18:07 +0000 (12:18 +0000)]

DO NOT MERGE Revert "DO NOT MERGE Update references to backup/restore agent timeouts"

This reverts commit f77cae61250c727630616b5672df2781e84a7e80.

Reason for revert: crashes SUW

Bug: 76128378
Change-Id: Ia77af64892aa5a03109cc4ef4c2c04b256000ba9

commit | commitdiff | tree

Christofer Åkersten [Thu, 22 Mar 2018 12:07:20 +0000 (12:07 +0000)]

Merge "Remove unnecessary Context from ApiLoader" into pi-dev am: bf121d2f13
am: 0f524c02b2

Change-Id: I648e9a39a7c546cedae9b20cc264dc88d9598473

commit | commitdiff | tree

Christofer Åkersten [Thu, 22 Mar 2018 12:00:58 +0000 (12:00 +0000)]

Merge "Remove unnecessary Context from ApiLoader" into pi-dev
am: bf121d2f13

Change-Id: I4659cad049c4d5dde7fc4543501661a93d6fa362

commit | commitdiff | tree

Julia Reynolds [Thu, 22 Mar 2018 12:00:58 +0000 (12:00 +0000)]

Merge "Fix index error" into pi-dev am: ae2f368907
am: 571c29428f

Change-Id: I000ceafa631ce39777eb1ef80503b7021de42170

commit | commitdiff | tree

Julia Reynolds [Thu, 22 Mar 2018 11:54:05 +0000 (11:54 +0000)]

Merge "Fix index error" into pi-dev
am: ae2f368907

Change-Id: I818ce7bfe0fc6cb5f0bbe25ede1ac443ab7ef052

commit | commitdiff | tree

Christofer Åkersten [Thu, 22 Mar 2018 11:49:41 +0000 (11:49 +0000)]

Merge "Remove unnecessary Context from ApiLoader" into pi-dev

commit | commitdiff | tree

Julia Reynolds [Thu, 22 Mar 2018 11:39:28 +0000 (11:39 +0000)]

Merge "Fix index error" into pi-dev

commit | commitdiff | tree

Lukas Zilka [Thu, 22 Mar 2018 11:12:24 +0000 (11:12 +0000)]

Merge "Adds support for a fall-back model when the language-specific model is not found." into pi-dev am: f9593d62b3
am: a30195420a

Change-Id: I7b2f81fd136b56e05857c06c07be3af89eed2d1a

commit | commitdiff | tree

Lukas Zilka [Thu, 22 Mar 2018 11:04:36 +0000 (11:04 +0000)]

Merge "Adds support for a fall-back model when the language-specific model is not found." into pi-dev
am: f9593d62b3

Change-Id: I5e47cfee132c1c2f081dfd39ff428e8629714179

commit | commitdiff | tree

TreeHugger Robot [Thu, 22 Mar 2018 10:50:47 +0000 (10:50 +0000)]

Merge "Adds support for a fall-back model when the language-specific model is not found." into pi-dev

commit | commitdiff | tree

Jordan Liu [Thu, 22 Mar 2018 09:10:17 +0000 (09:10 +0000)]

[automerger skipped]Merge "Finalise STK call control strings" into pi-dev am: 0fe28341e5 -s ours
am: c927760198 -s ours

Change-Id: I2c8cf7ee1cf48318ba83b8713b46f15c0dbe0a91

commit | commitdiff | tree

Jordan Liu [Thu, 22 Mar 2018 09:02:47 +0000 (09:02 +0000)]

[automerger skipped]Merge "Finalise STK call control strings" into pi-dev
am: 0fe28341e5 -s ours

Change-Id: I7741825c787c2da43b5b405fcd09c0ff2088c535

commit | commitdiff | tree

TreeHugger Robot [Thu, 22 Mar 2018 08:49:38 +0000 (08:49 +0000)]

Merge "Finalise STK call control strings" into pi-dev

commit | commitdiff | tree

Jordan Liu [Thu, 22 Mar 2018 06:57:35 +0000 (06:57 +0000)]

Merge "Finalise STK call control strings" am: 249119da53 am: eef3fce35d
am: 3d361c7ce9

Change-Id: Iae2eab9bfa5c8b130d46eaad4bbcbcd5d00e163e

commit | commitdiff | tree

Jordan Liu [Thu, 22 Mar 2018 06:45:11 +0000 (06:45 +0000)]

Merge "Finalise STK call control strings" am: 249119da53
am: eef3fce35d

Change-Id: I1b9cdb97baecbb04052addcf14beca475a44200a

commit | commitdiff | tree

Adrian Roos [Thu, 22 Mar 2018 06:39:03 +0000 (06:39 +0000)]

Merge "Letterbox: make letterbox work with drag resizing" into pi-dev am: ab3ffe4194
am: 23aad993cf

Change-Id: Iabf023523da964f41d538dde1b71ac77d0836deb

commit | commitdiff | tree

Jordan Liu [Thu, 22 Mar 2018 06:34:31 +0000 (06:34 +0000)]

Merge "Finalise STK call control strings"
am: 249119da53

Change-Id: Id1179bcd212731f5ceff44ad45b9f7ab6643c5c6

commit | commitdiff | tree

Adrian Roos [Thu, 22 Mar 2018 06:28:45 +0000 (06:28 +0000)]

Merge "Letterbox: make letterbox work with drag resizing" into pi-dev
am: ab3ffe4194

Change-Id: I8efd0e9e90633147cbeaf22af9783ba30249e8ca

commit | commitdiff | tree

TreeHugger Robot [Thu, 22 Mar 2018 06:16:00 +0000 (06:16 +0000)]

Merge "Letterbox: make letterbox work with drag resizing" into pi-dev

commit | commitdiff | tree

Holly Jiuyu Sun [Thu, 22 Mar 2018 06:14:25 +0000 (06:14 +0000)]

[automerger skipped]Merge "Mark eraseSubscriptions as @SystemApi." am: a99b258049 am: 44975ee51f -s ours
am: 1984d29700 -s ours

Change-Id: I2f473232f9d589d161bfc9cbafc0f180b63b5a54

commit | commitdiff | tree

Holly Jiuyu Sun [Thu, 22 Mar 2018 06:06:01 +0000 (06:06 +0000)]

[automerger skipped]Merge "Mark eraseSubscriptions as @SystemApi." am: a99b258049
am: 44975ee51f -s ours

Change-Id: Iab4f2a3cbe355daa52b800a1775c25438b10ade5

commit | commitdiff | tree

Holly Jiuyu Sun [Thu, 22 Mar 2018 05:59:18 +0000 (05:59 +0000)]

Merge "Mark eraseSubscriptions as @SystemApi."
am: a99b258049

Change-Id: Id2be8785239c34dbe705f0614aa9bfa9daa0aeec

commit | commitdiff | tree

Christofer Åkersten [Thu, 22 Mar 2018 05:53:53 +0000 (14:53 +0900)]

Remove unnecessary Context from ApiLoader

Bug: 76001644
Test: compile
Change-Id: I6ac81dac16374d90facfe33c68607c5c286b335f

commit | commitdiff | tree

Andrew Sapperstein [Thu, 22 Mar 2018 05:53:58 +0000 (05:53 +0000)]

Merge "Remove java-symbol for deleted string." into pi-dev am: 82a938c149
am: 729081708f

Change-Id: I468bbfec77c9149952667968521c247e2bc7b898

commit | commitdiff | tree

Bo Zhu [Thu, 22 Mar 2018 05:46:55 +0000 (22:46 -0700)]

Remove the hard-coded counterId in VaultParams

Bug: 72221676
Test: Manual test and runtest frameworks-services -p
com.android.server.locksettings.recoverablekeystore

Change-Id: I51cfac6478d59f41c1107106a14af008463f7de7

commit | commitdiff | tree

Jordan Liu [Thu, 22 Mar 2018 00:39:12 +0000 (17:39 -0700)]

Finalise STK call control strings

Bug: 64685331
Bug: 70352301
Test: manual
Change-Id: I53e9ec5e520f960b7adb3a29770e1f57065eb4c8
Merged-In: I53e9ec5e520f960b7adb3a29770e1f57065eb4c8

commit | commitdiff | tree

Andrew Sapperstein [Thu, 22 Mar 2018 05:41:01 +0000 (05:41 +0000)]

Merge "Remove java-symbol for deleted string." into pi-dev
am: 82a938c149

Change-Id: Ib3af18027bbcf2d2043aa881d9a840818470e5ff

commit | commitdiff | tree

Andrew Sapperstein [Thu, 22 Mar 2018 05:27:35 +0000 (05:27 +0000)]

Merge "Remove java-symbol for deleted string." into pi-dev

commit | commitdiff | tree

Andreas Terzis [Thu, 22 Mar 2018 05:21:50 +0000 (05:21 +0000)]

Merge "Enable new data usage settings features." into pi-dev am: 024cf8a707
am: e388407713

Change-Id: Iefc6ced58f4b654ceb85b22ea7143d252c59c5ea

commit | commitdiff | tree

Felipe Leme [Thu, 22 Mar 2018 05:17:22 +0000 (05:17 +0000)]

Merge "Set FIELD_AUTOFILL_NUM_DATASETS to -1 when service return no response." into pi-dev am: b3029a4f72
am: 082126b397

Change-Id: I91fce8617a71c61fd38ad7117fd33c9af2a5854b

commit | commitdiff | tree

Jordan Liu [Thu, 22 Mar 2018 05:14:31 +0000 (05:14 +0000)]

Merge "Finalise STK call control strings"

commit | commitdiff | tree

Andreas Terzis [Thu, 22 Mar 2018 05:11:25 +0000 (05:11 +0000)]

Merge "Enable new data usage settings features." into pi-dev
am: 024cf8a707

Change-Id: I73da0aa1526652ed470bab9f4230149ab9b7c32b

commit | commitdiff | tree

Felipe Leme [Thu, 22 Mar 2018 05:05:25 +0000 (05:05 +0000)]

Merge "Set FIELD_AUTOFILL_NUM_DATASETS to -1 when service return no response." into pi-dev
am: b3029a4f72

Change-Id: I042b254b83066a0f114f76ece040e3751a2a01e7

commit | commitdiff | tree

Andreas Terzis [Thu, 22 Mar 2018 05:02:10 +0000 (05:02 +0000)]

Merge "Enable new data usage settings features." into pi-dev

commit | commitdiff | tree

Felipe Leme [Thu, 22 Mar 2018 04:50:04 +0000 (04:50 +0000)]

Merge "Set FIELD_AUTOFILL_NUM_DATASETS to -1 when service return no response." into pi-dev

commit | commitdiff | tree

Holly Jiuyu Sun [Thu, 22 Mar 2018 03:45:55 +0000 (03:45 +0000)]

Merge "Mark eraseSubscriptions as @SystemApi."

commit | commitdiff | tree

Yohei Yukawa [Thu, 22 Mar 2018 03:32:36 +0000 (03:32 +0000)]

Merge "Make sure at least one non-aux IME is enabled" into pi-dev am: 245f8e5ab5
am: 368cc77d4b

Change-Id: Ic5842a6cb5ad78651ef4e112a017915a868ed95c

commit | commitdiff | tree

Yohei Yukawa [Thu, 22 Mar 2018 03:20:36 +0000 (03:20 +0000)]

Merge "Make sure at least one non-aux IME is enabled" into pi-dev
am: 245f8e5ab5

Change-Id: Id200c9569b3d71636ca3a8b5f4facf609ffa23d0

commit | commitdiff | tree

TreeHugger Robot [Thu, 22 Mar 2018 03:08:38 +0000 (03:08 +0000)]