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

OSDN Git Service

(root) / android-x86 / frameworks-base.git / log

summary | shortlog | log | commit | commitdiff | tree
first ⋅ prev ⋅ next

commit | commitdiff | tree

Android Build Merger (Role) [Mon, 9 Apr 2018 21:00:57 +0000 (21:00 +0000)]

[automerger] RESTRICT AUTOMERGE: Prevent reporting fake package name - framework (backport to mnc-dev) am: de71ee469a am: d672eef559 am: 86f5488521 skipped: 0df0b30be9 am: 815008072e am: aa20944ca4 am: 569ad1b287 am: 20a5009e23 skipped: 4fbc80f05b

Change-Id: I31f7f0b24c4abb211837b4143bd17922cbd910a1

commit | commitdiff | tree

Android Build Merger (Role) [Mon, 9 Apr 2018 21:00:53 +0000 (21:00 +0000)]

[automerger] RESTRICT AUTOMERGE: Prevent reporting fake package name - framework (backport to mnc-dev) am: de71ee469a am: d672eef559 am: 86f5488521 skipped: 0df0b30be9 am: 815008072e am: aa20944ca4 am: 569ad1b287 am: 20a5009e23

Change-Id: Idc5e03ce291191f07f6be769ee777e6dd8f59915

commit | commitdiff | tree

Android Build Merger (Role) [Mon, 9 Apr 2018 21:00:48 +0000 (21:00 +0000)]

[automerger] RESTRICT AUTOMERGE: Prevent reporting fake package name - framework (backport to mnc-dev) am: de71ee469a am: d672eef559 am: 86f5488521 skipped: 0df0b30be9 am: 815008072e am: aa20944ca4 am: 569ad1b287

Change-Id: I04b6008abff856d7998566a2e9136d62d6ac9c5e

commit | commitdiff | tree

Android Build Merger (Role) [Mon, 9 Apr 2018 21:00:43 +0000 (21:00 +0000)]

[automerger] RESTRICT AUTOMERGE: Prevent reporting fake package name - framework (backport to mnc-dev) am: de71ee469a am: d672eef559 am: 86f5488521 skipped: 0df0b30be9 am: 815008072e am: aa20944ca4

Change-Id: I4c4a136d4c77b6f1ba869992bb54be2ac755a9f7

commit | commitdiff | tree

Android Build Merger (Role) [Mon, 9 Apr 2018 21:00:38 +0000 (21:00 +0000)]

[automerger] RESTRICT AUTOMERGE: Prevent reporting fake package name - framework (backport to mnc-dev) am: de71ee469a am: d672eef559 am: 86f5488521 skipped: 0df0b30be9 am: 815008072e

Change-Id: Ibbfaf7f47f2471895f7fd5151be1230de51ff258

commit | commitdiff | tree

Android Build Merger (Role) [Mon, 9 Apr 2018 21:00:26 +0000 (21:00 +0000)]

[automerger] RESTRICT AUTOMERGE: Prevent reporting fake package name - framework (backport to mnc-dev) am: de71ee469a am: d672eef559 am: 86f5488521 skipped: 0df0b30be9

Change-Id: Idc789e68b33b1f8fd841204ce9ffb4b988f9c553

commit | commitdiff | tree

Android Build Merger (Role) [Mon, 9 Apr 2018 21:00:20 +0000 (21:00 +0000)]

[automerger] RESTRICT AUTOMERGE: Prevent reporting fake package name - framework (backport to mnc-dev) am: de71ee469a am: d672eef559 am: 86f5488521

Change-Id: I9f6c6fedfdc987a2acf1978a71fb0bdcd034e9e0

commit | commitdiff | tree

Android Build Merger (Role) [Mon, 9 Apr 2018 21:00:15 +0000 (21:00 +0000)]

[automerger] RESTRICT AUTOMERGE: Prevent reporting fake package name - framework (backport to mnc-dev) am: de71ee469a am: d672eef559

Change-Id: Ib50692050fd4e62ad80f24531818a378c75dfe25

commit | commitdiff | tree

Android Build Merger (Role) [Mon, 9 Apr 2018 21:00:08 +0000 (21:00 +0000)]

[automerger] RESTRICT AUTOMERGE: Prevent reporting fake package name - framework (backport to mnc-dev) am: de71ee469a

Change-Id: I000fae45e723679ba44b378a36a85daef20ae96d

commit | commitdiff | tree

akirilov [Thu, 22 Mar 2018 21:01:44 +0000 (14:01 -0700)]

RESTRICT AUTOMERGE: Prevent reporting fake package name - framework (backport to mnc-dev)

Test: added AccessibilityEndToEndTest#testPackageNameCannotBeFaked
cts-tradefed run cts --package android.accessibilityservice
cts-tradefed run cts --package android.accessibility

BUG:69981755

Change-Id: Id9990ccf1e88cea441f9b8927e849e67a059cfe4

commit | commitdiff | tree

Android Build Merger (Role) [Mon, 9 Apr 2018 20:18:09 +0000 (20:18 +0000)]

[automerger] Fix issue #27317952: PendingIntent.getIntent() should be protected am: ae77fa4725 am: d6b6319286 am: 73fcfd424e am: cb76e24e62 am: 209f5413a1 am: f91e527a32 am: db6d6a2914 am: 42dee597da am: 65b3f30dfe

Change-Id: I37d65e9e885739b3f4a897f9ceabe221534e65f8

commit | commitdiff | tree

Android Build Merger (Role) [Mon, 9 Apr 2018 20:18:03 +0000 (20:18 +0000)]

[automerger] Fix issue #27317952: PendingIntent.getIntent() should be protected am: ae77fa4725 am: d6b6319286 am: 73fcfd424e am: cb76e24e62 am: 209f5413a1 am: f91e527a32 am: db6d6a2914 am: 42dee597da

Change-Id: Ic1cb5a34385d6cbdb2e332fd96b6caf6c53b353b

commit | commitdiff | tree

Android Build Merger (Role) [Mon, 9 Apr 2018 20:17:57 +0000 (20:17 +0000)]

[automerger] Fix issue #27317952: PendingIntent.getIntent() should be protected am: ae77fa4725 am: d6b6319286 am: 73fcfd424e am: cb76e24e62 am: 209f5413a1 am: f91e527a32 am: db6d6a2914

Change-Id: Id6bc4a730ed862e380eb3b396a61999c56d2c679

commit | commitdiff | tree

Android Build Merger (Role) [Mon, 9 Apr 2018 20:17:52 +0000 (20:17 +0000)]

[automerger] Fix issue #27317952: PendingIntent.getIntent() should be protected am: ae77fa4725 am: d6b6319286 am: 73fcfd424e am: cb76e24e62 am: 209f5413a1 am: f91e527a32

Change-Id: I4a2e77198d157f52266095338cf118896fb53348

commit | commitdiff | tree

Android Build Merger (Role) [Mon, 9 Apr 2018 20:17:44 +0000 (20:17 +0000)]

[automerger] Fix issue #27317952: PendingIntent.getIntent() should be protected am: ae77fa4725 am: d6b6319286 am: 73fcfd424e am: cb76e24e62 am: 209f5413a1

Change-Id: I29865f40b20c86a3d13493886cfe818638075fea

commit | commitdiff | tree

Android Build Merger (Role) [Mon, 9 Apr 2018 20:17:24 +0000 (20:17 +0000)]

[automerger] Fix issue #27317952: PendingIntent.getIntent() should be protected am: ae77fa4725 am: d6b6319286 am: 73fcfd424e am: cb76e24e62

Change-Id: Id581b577b7c21bca96019a0a1b9c4bb3c3abc7f6

commit | commitdiff | tree

Android Build Merger (Role) [Mon, 9 Apr 2018 20:17:15 +0000 (20:17 +0000)]

[automerger] Fix issue #27317952: PendingIntent.getIntent() should be protected am: ae77fa4725 am: d6b6319286 am: 73fcfd424e

Change-Id: I9719266bad39cd58527b0aaeec10b39a1eba3509

commit | commitdiff | tree

Android Build Merger (Role) [Mon, 9 Apr 2018 20:17:09 +0000 (20:17 +0000)]

[automerger] Fix issue #27317952: PendingIntent.getIntent() should be protected am: ae77fa4725 am: d6b6319286

Change-Id: Ic3796cc42e2ce78558fe47cff83e19d1aa52cea1

commit | commitdiff | tree

Android Build Merger (Role) [Mon, 9 Apr 2018 20:16:59 +0000 (20:16 +0000)]

[automerger] Fix issue #27317952: PendingIntent.getIntent() should be protected am: ae77fa4725

Change-Id: Ic2e2b8d07e1f9872189282923114846db3b3c94c

commit | commitdiff | tree

Dianne Hackborn [Tue, 1 Mar 2016 02:02:43 +0000 (18:02 -0800)]

Fix issue #27317952: PendingIntent.getIntent() should be protected

Bug: 64752751
Change-Id: Ib05135cd94f5251942a6fc6df542ed39083f7827
(cherry picked from commit e5ad41bc022db99c4f6663da0a9e49356c006741)

commit | commitdiff | tree

Fyodor Kupolov [Fri, 16 Mar 2018 19:20:40 +0000 (12:20 -0700)]

Use concrete CREATOR instance for parceling lists

Replaced readTypedArrayList/writeTypedArrayList with
writeTypedList/createTypedArrayList(CREATOR)

Bug: 71508348
Test: CtsAutoFillServiceTestCases pass
Merged-In: I2a8321023b40cc74b7026eb0fb32a9cc5f5543a9
Change-Id: Id17d02e40a4ae567bf2d74d2ea8ba4d8a943bdb7

commit | commitdiff | tree

TreeHugger Robot [Thu, 15 Mar 2018 21:39:46 +0000 (21:39 +0000)]

Merge changes from topic "am-4832db20-4618-4c51-930c-c4179c7f0a1b" into nyc-mr2-dev

* changes:
[automerger skipped] DO NOT MERGE: Restoring Network Available Notification to AGnssRil skipped: 3656457fac
DO NOT MERGE: Restoring Network Available Notification to AGnssRil

commit | commitdiff | tree

TreeHugger Robot [Thu, 15 Mar 2018 21:39:46 +0000 (21:39 +0000)]

Merge "DO NOT MERGE: Restoring Network Available Notification to AGnssRil" into cw-f-dev

commit | commitdiff | tree

TreeHugger Robot [Thu, 15 Mar 2018 21:39:46 +0000 (21:39 +0000)]

Merge changes from topic "am-4832db20-4618-4c51-930c-c4179c7f0a1b" into oc-dev

* changes:
  [automerger skipped] DO NOT MERGE: Restoring Network Available Notification to AGnssRil skipped: 3656457fac skipped: d3ef137680
  [automerger skipped] DO NOT MERGE: Restoring Network Available Notification to AGnssRil skipped: 3656457fac
  DO NOT MERGE: Restoring Network Available Notification to AGnssRil

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 15 Mar 2018 20:00:14 +0000 (20:00 +0000)]

[automerger] DO NOT MERGE Rework thumbnail cleanup am: b514ce9b38 am: b8dad6c644 am: 019eec3923 skipped: 9d13b0f6ca am: 4ef2cbc58d am: 31ee079d5f am: 6100f6d3b2 am: c077fab855 skipped: 1160018fef

Change-Id: I1b2bb3c0c2adf15d344697381e5651b9a6adbf9f

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 15 Mar 2018 20:00:09 +0000 (20:00 +0000)]

[automerger] DO NOT MERGE Rework thumbnail cleanup am: b514ce9b38 am: b8dad6c644 am: 019eec3923 skipped: 9d13b0f6ca am: 4ef2cbc58d am: 31ee079d5f am: 6100f6d3b2 am: c077fab855

Change-Id: Ia2f661ae02c925da5d6e05f96983cc3f606cd9bd

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 15 Mar 2018 20:00:04 +0000 (20:00 +0000)]

[automerger] DO NOT MERGE Rework thumbnail cleanup am: b514ce9b38 am: b8dad6c644 am: 019eec3923 skipped: 9d13b0f6ca am: 4ef2cbc58d am: 31ee079d5f am: 6100f6d3b2

Change-Id: I6388ec63ab6d29d1b002cc296571e67278245fc0

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 15 Mar 2018 19:59:59 +0000 (19:59 +0000)]

[automerger] DO NOT MERGE Rework thumbnail cleanup am: b514ce9b38 am: b8dad6c644 am: 019eec3923 skipped: 9d13b0f6ca am: 4ef2cbc58d am: 31ee079d5f

Change-Id: I3a801f0e6cadeb98e28d91c52062e6e63164bca2

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 15 Mar 2018 19:59:54 +0000 (19:59 +0000)]

[automerger] DO NOT MERGE Rework thumbnail cleanup am: b514ce9b38 am: b8dad6c644 am: 019eec3923 skipped: 9d13b0f6ca am: 4ef2cbc58d

Change-Id: I17d0b95d850a142500d3932a472659c1e9e804f3

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 15 Mar 2018 19:59:42 +0000 (19:59 +0000)]

[automerger] DO NOT MERGE Rework thumbnail cleanup am: b514ce9b38 am: b8dad6c644 am: 019eec3923 skipped: 9d13b0f6ca

Change-Id: Ib29c785708e959391b3e388b453147e94037420f

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 15 Mar 2018 19:59:37 +0000 (19:59 +0000)]

[automerger] DO NOT MERGE Rework thumbnail cleanup am: b514ce9b38 am: b8dad6c644 am: 019eec3923

Change-Id: I9f69b090824a6c91bf11dbc0929ba5988a06af52

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 15 Mar 2018 19:59:32 +0000 (19:59 +0000)]

[automerger] DO NOT MERGE Rework thumbnail cleanup am: b514ce9b38 am: b8dad6c644

Change-Id: I8539a02510ed9a61b683c66c66de7d1b319c2603

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 15 Mar 2018 19:59:26 +0000 (19:59 +0000)]

[automerger] DO NOT MERGE Rework thumbnail cleanup am: b514ce9b38

Change-Id: I5cb1316547ced23a1259e068d1ea34631d105608

commit | commitdiff | tree

Marco Nelissen [Tue, 7 Nov 2017 21:52:02 +0000 (13:52 -0800)]

DO NOT MERGE Rework thumbnail cleanup

Bug: 63766886
Test: ran CTS tests
Change-Id: I1f92bb014e275eafe3f42aef1f8c817f187c6608
Merged-In: I1f92bb014e275eafe3f42aef1f8c817f187c6608

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 14 Mar 2018 15:24:33 +0000 (15:24 +0000)]

[automerger] DO NOT MERGE Fix build with SDK 24-like implementation of constructor am: f3c2e0b3ab am: 1b6f3f9a97 am: d0fcb49352 skipped: 93f8bfa5c4 am: e32e8229b3 am: f98157e2ba am: 4f83bad908 am: a982645d5c skipped: 9d3e228729

Change-Id: I1ce639a3ea40693d82501861d4b81afd3506b37d

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 14 Mar 2018 15:24:27 +0000 (15:24 +0000)]

[automerger] DO NOT MERGE Fix build with SDK 24-like implementation of constructor am: f3c2e0b3ab am: 1b6f3f9a97 am: d0fcb49352 skipped: 93f8bfa5c4 am: e32e8229b3 am: f98157e2ba am: 4f83bad908 am: a982645d5c

Change-Id: I329294b80015cbfb2c498c0752b340cbaf527735

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 14 Mar 2018 15:24:17 +0000 (15:24 +0000)]

[automerger] DO NOT MERGE Fix build with SDK 24-like implementation of constructor am: f3c2e0b3ab am: 1b6f3f9a97 am: d0fcb49352 skipped: 93f8bfa5c4 am: e32e8229b3 am: f98157e2ba am: 4f83bad908

Change-Id: I927087da2df9ad993b449d8ec9b90bd641088d75

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 14 Mar 2018 15:24:12 +0000 (15:24 +0000)]

[automerger] DO NOT MERGE Fix build with SDK 24-like implementation of constructor am: f3c2e0b3ab am: 1b6f3f9a97 am: d0fcb49352 skipped: 93f8bfa5c4 am: e32e8229b3 am: f98157e2ba

Change-Id: I7204eee21fc2620f70dc8bc534aa0160d947ab7e

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 14 Mar 2018 15:24:06 +0000 (15:24 +0000)]

[automerger] DO NOT MERGE Fix build with SDK 24-like implementation of constructor am: f3c2e0b3ab am: 1b6f3f9a97 am: d0fcb49352 skipped: 93f8bfa5c4 am: e32e8229b3

Change-Id: I916228fb05914dbb89551a27418f746305a01ed6

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 14 Mar 2018 15:23:46 +0000 (15:23 +0000)]

[automerger] DO NOT MERGE Fix build with SDK 24-like implementation of constructor am: f3c2e0b3ab am: 1b6f3f9a97 am: d0fcb49352 skipped: 93f8bfa5c4

Change-Id: Ie516029e98d07f4ebb6916d75af625c92e711fde

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 14 Mar 2018 15:23:39 +0000 (15:23 +0000)]

[automerger] DO NOT MERGE Fix build with SDK 24-like implementation of constructor am: f3c2e0b3ab am: 1b6f3f9a97 am: d0fcb49352

Change-Id: Ib890ce7495c1d5e64968cc9177ce3785bcfdedde

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 14 Mar 2018 15:23:32 +0000 (15:23 +0000)]

[automerger] DO NOT MERGE Fix build with SDK 24-like implementation of constructor am: f3c2e0b3ab am: 1b6f3f9a97

Change-Id: I49de968aa0daa18b60921af1a381f77d13a8ff0e

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 14 Mar 2018 15:23:19 +0000 (15:23 +0000)]

[automerger] DO NOT MERGE Fix build with SDK 24-like implementation of constructor am: f3c2e0b3ab

Change-Id: I87dcb4ce2fc52e0ed6ce5f79d15ab49084d088e3

commit | commitdiff | tree

Alan Viverette [Tue, 13 Mar 2018 17:56:24 +0000 (13:56 -0400)]

DO NOT MERGE Fix build with SDK 24-like implementation of constructor

Bug: 71992105
Test: manual
Change-Id: I106760ada9c85adde29fd143e5dfcd924fd95f54

commit | commitdiff | tree

Android Build Merger (Role) [Tue, 13 Mar 2018 21:23:02 +0000 (21:23 +0000)]

[automerger skipped] DO NOT MERGE: Restoring Network Available Notification to AGnssRil skipped: 3656457fac skipped: d3ef137680

Change-Id: I166bdfa211911d3f3ebcc03af1e9c98edc54d8fc

commit | commitdiff | tree

Android Build Merger (Role) [Tue, 13 Mar 2018 21:22:58 +0000 (21:22 +0000)]

[automerger skipped] DO NOT MERGE: Restoring Network Available Notification to AGnssRil skipped: 3656457fac

Change-Id: Ifd4e09852646522a10971a38cf43ec1282d79dad

commit | commitdiff | tree

Wyatt Riley [Tue, 13 Dec 2016 18:45:29 +0000 (10:45 -0800)]

DO NOT MERGE: Restoring Network Available Notification to AGnssRil

Adds connectivity notification back for SUPL specific
case, needed esp. for case where WiFi is off and a
general purpose connectivity notification doesn't fire.

Bug: 33350903
Fixes: 33350903
Test: On device GPS-still-works checked, as well as notifications
going into HAL on airplane mode on/off, and SUPL call flows
(Further AGnssRil check to be done by partners)

Change-Id: I02af0b839d0bfd21dfefedff743208e02ab9c2dd
(cherry picked from commit 41f6bcebaf5fc687097f47411aacce7cc93d61d1)

commit | commitdiff | tree

Android Build Merger (Role) [Tue, 13 Mar 2018 00:25:54 +0000 (00:25 +0000)]

[automerger] Rework thumbnail cleanup am: 0dc23f95a1 skipped: 75767d1e3c am: 6720ea0b94 am: 16ee12ac68 am: d08bb4b174

Change-Id: I9749a1bacc983ee7fff06649f55d9b91d8df54ac

commit | commitdiff | tree

Android Build Merger (Role) [Tue, 13 Mar 2018 00:25:44 +0000 (00:25 +0000)]

[automerger] Rework thumbnail cleanup am: 0dc23f95a1 skipped: 75767d1e3c am: 6720ea0b94 am: 16ee12ac68

Change-Id: If81e264d57c533a12e270c197e99a31c895fa2dd

commit | commitdiff | tree

Android Build Merger (Role) [Tue, 13 Mar 2018 00:25:33 +0000 (00:25 +0000)]

[automerger] Rework thumbnail cleanup am: 0dc23f95a1 skipped: 75767d1e3c am: 6720ea0b94

Change-Id: Ibd9203bd7f91b9d25aaf497239e52e81bf18c295

commit | commitdiff | tree

Android Build Merger (Role) [Tue, 13 Mar 2018 00:25:25 +0000 (00:25 +0000)]

[automerger] Rework thumbnail cleanup am: 0dc23f95a1 skipped: 75767d1e3c

Change-Id: I36851ba644feb11c57aff0fe6bb218f5c6f14be4

commit | commitdiff | tree

Android Build Merger (Role) [Tue, 13 Mar 2018 00:23:52 +0000 (00:23 +0000)]

[automerger] Rework thumbnail cleanup am: 0dc23f95a1

Change-Id: Ia3a740184191990fa43ca705b5eae8ea572fb6c1

commit | commitdiff | tree

Marco Nelissen [Tue, 7 Nov 2017 21:52:02 +0000 (13:52 -0800)]

Rework thumbnail cleanup

Bug: 63766886
Test: ran CTS tests
Change-Id: I1f92bb014e275eafe3f42aef1f8c817f187c6608
Merged-In: I1f92bb014e275eafe3f42aef1f8c817f187c6608

commit | commitdiff | tree

Marco Nelissen [Mon, 12 Mar 2018 21:29:58 +0000 (21:29 +0000)]

Merge changes from topic "thumbnails-nyc-mr1-dev" into nyc-mr2-dev

* changes:
  [automerger] Rework thumbnail cleanup am: 82a2a87474 am: 97eb9d056a
  [automerger] Rework thumbnail cleanup am: 82a2a87474
  Rework thumbnail cleanup

commit | commitdiff | tree

Marco Nelissen [Mon, 12 Mar 2018 21:29:58 +0000 (21:29 +0000)]

Merge changes from topic "thumbnails-nyc-mr1-dev" into cw-f-dev

* changes:
[automerger] Rework thumbnail cleanup am: 82a2a87474
Rework thumbnail cleanup

commit | commitdiff | tree

Marco Nelissen [Mon, 12 Mar 2018 21:29:58 +0000 (21:29 +0000)]

Merge "Rework thumbnail cleanup" into nyc-mr1-dev

commit | commitdiff | tree

Android Build Merger (Role) [Mon, 12 Mar 2018 19:54:22 +0000 (19:54 +0000)]

[automerger] Rework thumbnail cleanup am: 82a2a87474 am: 97eb9d056a skipped: cb9dd5d0e6

Change-Id: Id9b936c4829603ea09fcc631a56755805ffc2b83

commit | commitdiff | tree

Marco Nelissen [Tue, 7 Nov 2017 21:52:02 +0000 (13:52 -0800)]

Rework thumbnail cleanup -- DO NOT MERGE

Bug: 63766886
Test: ran CTS tests
Change-Id: I1f92bb014e275eafe3f42aef1f8c817f187c6608
Merged-In: I1f92bb014e275eafe3f42aef1f8c817f187c6608

commit | commitdiff | tree

Pengquan Meng [Fri, 9 Mar 2018 23:37:01 +0000 (23:37 +0000)]

Merge changes from topic "am-59911b1f-fa0c-400c-a3f8-812ac0a8762b" into mnc-dr1.5-dev

* changes:
  [automerger] Fixed Security Vulnerability of DcParamObject am: 8c55a70728 am: 61f84448eb am: a007cb0734
  [automerger] Fixed Security Vulnerability of DcParamObject am: 8c55a70728 am: 61f84448eb
  [automerger] Fixed Security Vulnerability of DcParamObject am: 8c55a70728
  Fixed Security Vulnerability of DcParamObject

commit | commitdiff | tree

Pengquan Meng [Fri, 9 Mar 2018 23:37:01 +0000 (23:37 +0000)]

Merge changes from topic "am-59911b1f-fa0c-400c-a3f8-812ac0a8762b" into cw-e-dev

* changes:
  [automerger] Fixed Security Vulnerability of DcParamObject am: 8c55a70728 am: 61f84448eb
  [automerger] Fixed Security Vulnerability of DcParamObject am: 8c55a70728
  Fixed Security Vulnerability of DcParamObject

commit | commitdiff | tree

Pengquan Meng [Fri, 9 Mar 2018 23:37:01 +0000 (23:37 +0000)]

Merge changes from topic "am-59911b1f-fa0c-400c-a3f8-812ac0a8762b" into mnc-dr-dev

* changes:
[automerger] Fixed Security Vulnerability of DcParamObject am: 8c55a70728
Fixed Security Vulnerability of DcParamObject

commit | commitdiff | tree

Pengquan Meng [Fri, 9 Mar 2018 23:37:01 +0000 (23:37 +0000)]

Merge "Fixed Security Vulnerability of DcParamObject" into mnc-dev

commit | commitdiff | tree

Pengquan Meng [Fri, 9 Mar 2018 23:37:01 +0000 (23:37 +0000)]

Merge changes from topic "am-59911b1f-fa0c-400c-a3f8-812ac0a8762b" into nyc-dr1-dev

* changes:
  [automerger] Fixed Security Vulnerability of DcParamObject am: 8c55a70728 am: 61f84448eb am: a007cb0734 am: 3b356d5111 am: a61fe8f6c0
  [automerger] Fixed Security Vulnerability of DcParamObject am: 8c55a70728 am: 61f84448eb am: a007cb0734 am: 3b356d5111
  [automerger] Fixed Security Vulnerability of DcParamObject am: 8c55a70728 am: 61f84448eb am: a007cb0734
  [automerger] Fixed Security Vulnerability of DcParamObject am: 8c55a70728 am: 61f84448eb
  [automerger] Fixed Security Vulnerability of DcParamObject am: 8c55a70728
  Fixed Security Vulnerability of DcParamObject

commit | commitdiff | tree

Pengquan Meng [Fri, 9 Mar 2018 23:37:01 +0000 (23:37 +0000)]

Merge changes from topic "am-59911b1f-fa0c-400c-a3f8-812ac0a8762b" into nyc-dev

* changes:
  [automerger] Fixed Security Vulnerability of DcParamObject am: 8c55a70728 am: 61f84448eb am: a007cb0734 am: 3b356d5111
  [automerger] Fixed Security Vulnerability of DcParamObject am: 8c55a70728 am: 61f84448eb am: a007cb0734
  [automerger] Fixed Security Vulnerability of DcParamObject am: 8c55a70728 am: 61f84448eb
  [automerger] Fixed Security Vulnerability of DcParamObject am: 8c55a70728
  Fixed Security Vulnerability of DcParamObject

commit | commitdiff | tree

Pengquan Meng [Fri, 9 Mar 2018 23:37:01 +0000 (23:37 +0000)]

Merge changes from topic "am-59911b1f-fa0c-400c-a3f8-812ac0a8762b" into nyc-mr2-dev

* changes:
  [automerger] Fixed Security Vulnerability of DcParamObject am: 8c55a70728 am: 61f84448eb am: a007cb0734 am: 3b356d5111 am: a61fe8f6c0 am: 3276de21ea am: bd60a681bf am: 5d5e5ca7cb
  [automerger] Fixed Security Vulnerability of DcParamObject am: 8c55a70728 am: 61f84448eb am: a007cb0734 am: 3b356d5111 am: a61fe8f6c0 am: 3276de21ea am: bd60a681bf
  [automerger] Fixed Security Vulnerability of DcParamObject am: 8c55a70728 am: 61f84448eb am: a007cb0734 am: 3b356d5111 am: a61fe8f6c0 am: 3276de21ea
  [automerger] Fixed Security Vulnerability of DcParamObject am: 8c55a70728 am: 61f84448eb am: a007cb0734 am: 3b356d5111 am: a61fe8f6c0
  [automerger] Fixed Security Vulnerability of DcParamObject am: 8c55a70728 am: 61f84448eb am: a007cb0734 am: 3b356d5111
  [automerger] Fixed Security Vulnerability of DcParamObject am: 8c55a70728 am: 61f84448eb am: a007cb0734
  [automerger] Fixed Security Vulnerability of DcParamObject am: 8c55a70728 am: 61f84448eb
  [automerger] Fixed Security Vulnerability of DcParamObject am: 8c55a70728
  Fixed Security Vulnerability of DcParamObject

commit | commitdiff | tree

Pengquan Meng [Fri, 9 Mar 2018 23:37:01 +0000 (23:37 +0000)]

Merge changes from topic "am-59911b1f-fa0c-400c-a3f8-812ac0a8762b" into cw-f-dev

* changes:
  [automerger] Fixed Security Vulnerability of DcParamObject am: 8c55a70728 am: 61f84448eb am: a007cb0734 am: 3b356d5111 am: a61fe8f6c0 am: 3276de21ea am: bd60a681bf
  [automerger] Fixed Security Vulnerability of DcParamObject am: 8c55a70728 am: 61f84448eb am: a007cb0734 am: 3b356d5111 am: a61fe8f6c0 am: 3276de21ea
  [automerger] Fixed Security Vulnerability of DcParamObject am: 8c55a70728 am: 61f84448eb am: a007cb0734 am: 3b356d5111 am: a61fe8f6c0
  [automerger] Fixed Security Vulnerability of DcParamObject am: 8c55a70728 am: 61f84448eb am: a007cb0734 am: 3b356d5111
  [automerger] Fixed Security Vulnerability of DcParamObject am: 8c55a70728 am: 61f84448eb am: a007cb0734
  [automerger] Fixed Security Vulnerability of DcParamObject am: 8c55a70728 am: 61f84448eb
  [automerger] Fixed Security Vulnerability of DcParamObject am: 8c55a70728
  Fixed Security Vulnerability of DcParamObject

commit | commitdiff | tree

Pengquan Meng [Fri, 9 Mar 2018 23:37:01 +0000 (23:37 +0000)]

Merge changes from topic "am-59911b1f-fa0c-400c-a3f8-812ac0a8762b" into nyc-mr1-dev

* changes:
  [automerger] Fixed Security Vulnerability of DcParamObject am: 8c55a70728 am: 61f84448eb am: a007cb0734 am: 3b356d5111 am: a61fe8f6c0 am: 3276de21ea
  [automerger] Fixed Security Vulnerability of DcParamObject am: 8c55a70728 am: 61f84448eb am: a007cb0734 am: 3b356d5111 am: a61fe8f6c0
  [automerger] Fixed Security Vulnerability of DcParamObject am: 8c55a70728 am: 61f84448eb am: a007cb0734 am: 3b356d5111
  [automerger] Fixed Security Vulnerability of DcParamObject am: 8c55a70728 am: 61f84448eb am: a007cb0734
  [automerger] Fixed Security Vulnerability of DcParamObject am: 8c55a70728 am: 61f84448eb
  [automerger] Fixed Security Vulnerability of DcParamObject am: 8c55a70728
  Fixed Security Vulnerability of DcParamObject

commit | commitdiff | tree

Pengquan Meng [Fri, 9 Mar 2018 23:37:01 +0000 (23:37 +0000)]

Merge changes from topic "am-59911b1f-fa0c-400c-a3f8-812ac0a8762b" into oc-dev

* changes:
  [automerger] Fixed Security Vulnerability of DcParamObject am: 8c55a70728 am: 61f84448eb am: a007cb0734 am: 3b356d5111 am: a61fe8f6c0 am: 3276de21ea am: bd60a681bf am: 5d5e5ca7cb am: f64ab1e93d
  [automerger] Fixed Security Vulnerability of DcParamObject am: 8c55a70728 am: 61f84448eb am: a007cb0734 am: 3b356d5111 am: a61fe8f6c0 am: 3276de21ea am: bd60a681bf am: 5d5e5ca7cb
  [automerger] Fixed Security Vulnerability of DcParamObject am: 8c55a70728 am: 61f84448eb am: a007cb0734 am: 3b356d5111 am: a61fe8f6c0 am: 3276de21ea am: bd60a681bf
  [automerger] Fixed Security Vulnerability of DcParamObject am: 8c55a70728 am: 61f84448eb am: a007cb0734 am: 3b356d5111 am: a61fe8f6c0 am: 3276de21ea
  [automerger] Fixed Security Vulnerability of DcParamObject am: 8c55a70728 am: 61f84448eb am: a007cb0734 am: 3b356d5111 am: a61fe8f6c0
  [automerger] Fixed Security Vulnerability of DcParamObject am: 8c55a70728 am: 61f84448eb am: a007cb0734 am: 3b356d5111
  [automerger] Fixed Security Vulnerability of DcParamObject am: 8c55a70728 am: 61f84448eb am: a007cb0734
  [automerger] Fixed Security Vulnerability of DcParamObject am: 8c55a70728 am: 61f84448eb
  [automerger] Fixed Security Vulnerability of DcParamObject am: 8c55a70728
  Fixed Security Vulnerability of DcParamObject

commit | commitdiff | tree

Android Build Merger (Role) [Fri, 9 Mar 2018 20:33:52 +0000 (20:33 +0000)]

[automerger] Rework thumbnail cleanup am: 82a2a87474 am: 97eb9d056a

Change-Id: Id58fd0db50cf10dd0af21464259e7a6e366edecd

commit | commitdiff | tree

Android Build Merger (Role) [Fri, 9 Mar 2018 20:33:45 +0000 (20:33 +0000)]

[automerger] Rework thumbnail cleanup am: 82a2a87474

Change-Id: Ifbeecd9b3406da6151067987709776adeb807c1f

commit | commitdiff | tree

Marco Nelissen [Tue, 7 Nov 2017 21:52:02 +0000 (13:52 -0800)]

Rework thumbnail cleanup

Bug: 63766886
Test: ran CTS tests
Change-Id: I1f92bb014e275eafe3f42aef1f8c817f187c6608
Merged-In: I1f92bb014e275eafe3f42aef1f8c817f187c6608

commit | commitdiff | tree

Alan Viverette [Fri, 9 Mar 2018 18:43:02 +0000 (18:43 +0000)]

Merge changes from topic "viewpager_state" into mnc-dr1.5-dev

* changes:
  [automerger] Update internal ViewPager's SavedState to match Support Library version am: 187964aca1 am: 4c24e4d831 am: fece305de0
  [automerger] Update internal ViewPager's SavedState to match Support Library version am: 187964aca1 am: 4c24e4d831
  [automerger] Update internal ViewPager's SavedState to match Support Library version am: 187964aca1
  Update internal ViewPager's SavedState to match Support Library version

commit | commitdiff | tree

Alan Viverette [Fri, 9 Mar 2018 18:43:02 +0000 (18:43 +0000)]

Merge changes from topic "viewpager_state" into cw-e-dev

* changes:
  [automerger] Update internal ViewPager's SavedState to match Support Library version am: 187964aca1 am: 4c24e4d831
  [automerger] Update internal ViewPager's SavedState to match Support Library version am: 187964aca1
  Update internal ViewPager's SavedState to match Support Library version

commit | commitdiff | tree

Alan Viverette [Fri, 9 Mar 2018 18:43:02 +0000 (18:43 +0000)]

Merge changes from topic "viewpager_state" into mnc-dr-dev

* changes:
[automerger] Update internal ViewPager's SavedState to match Support Library version am: 187964aca1
Update internal ViewPager's SavedState to match Support Library version

commit | commitdiff | tree

Alan Viverette [Fri, 9 Mar 2018 18:43:02 +0000 (18:43 +0000)]

Merge "Update internal ViewPager's SavedState to match Support Library version" into mnc-dev

commit | commitdiff | tree

Alan Viverette [Fri, 9 Mar 2018 18:43:02 +0000 (18:43 +0000)]

Merge changes from topic "viewpager_state" into nyc-dr1-dev

* changes:
  [automerger] Update internal ViewPager's SavedState to match Support Library version am: 187964aca1 am: 4c24e4d831 am: fece305de0 am: cb362192e8 am: bc42f76941
  [automerger] Update internal ViewPager's SavedState to match Support Library version am: 187964aca1 am: 4c24e4d831 am: fece305de0 am: cb362192e8
  [automerger] Update internal ViewPager's SavedState to match Support Library version am: 187964aca1 am: 4c24e4d831 am: fece305de0
  [automerger] Update internal ViewPager's SavedState to match Support Library version am: 187964aca1 am: 4c24e4d831
  [automerger] Update internal ViewPager's SavedState to match Support Library version am: 187964aca1
  Update internal ViewPager's SavedState to match Support Library version

commit | commitdiff | tree

Alan Viverette [Fri, 9 Mar 2018 18:43:02 +0000 (18:43 +0000)]

Merge changes from topic "viewpager_state" into nyc-dev

* changes:
  [automerger] Update internal ViewPager's SavedState to match Support Library version am: 187964aca1 am: 4c24e4d831 am: fece305de0 am: cb362192e8
  [automerger] Update internal ViewPager's SavedState to match Support Library version am: 187964aca1 am: 4c24e4d831 am: fece305de0
  [automerger] Update internal ViewPager's SavedState to match Support Library version am: 187964aca1 am: 4c24e4d831
  [automerger] Update internal ViewPager's SavedState to match Support Library version am: 187964aca1
  Update internal ViewPager's SavedState to match Support Library version

commit | commitdiff | tree

Alan Viverette [Fri, 9 Mar 2018 18:43:02 +0000 (18:43 +0000)]

Merge changes from topic "viewpager_state" into nyc-mr2-dev

* changes:
  [automerger] Update internal ViewPager's SavedState to match Support Library version am: 187964aca1 am: 4c24e4d831 am: fece305de0 am: cb362192e8 am: bc42f76941 am: c42091667c am: aebf5c06df am: d04ccc6608
  [automerger] Update internal ViewPager's SavedState to match Support Library version am: 187964aca1 am: 4c24e4d831 am: fece305de0 am: cb362192e8 am: bc42f76941 am: c42091667c am: aebf5c06df
  [automerger] Update internal ViewPager's SavedState to match Support Library version am: 187964aca1 am: 4c24e4d831 am: fece305de0 am: cb362192e8 am: bc42f76941 am: c42091667c
  [automerger] Update internal ViewPager's SavedState to match Support Library version am: 187964aca1 am: 4c24e4d831 am: fece305de0 am: cb362192e8 am: bc42f76941
  [automerger] Update internal ViewPager's SavedState to match Support Library version am: 187964aca1 am: 4c24e4d831 am: fece305de0 am: cb362192e8
  [automerger] Update internal ViewPager's SavedState to match Support Library version am: 187964aca1 am: 4c24e4d831 am: fece305de0
  [automerger] Update internal ViewPager's SavedState to match Support Library version am: 187964aca1 am: 4c24e4d831
  [automerger] Update internal ViewPager's SavedState to match Support Library version am: 187964aca1
  Update internal ViewPager's SavedState to match Support Library version

commit | commitdiff | tree

Alan Viverette [Fri, 9 Mar 2018 18:43:02 +0000 (18:43 +0000)]

Merge changes from topic "viewpager_state" into cw-f-dev

* changes:
  [automerger] Update internal ViewPager's SavedState to match Support Library version am: 187964aca1 am: 4c24e4d831 am: fece305de0 am: cb362192e8 am: bc42f76941 am: c42091667c am: aebf5c06df
  [automerger] Update internal ViewPager's SavedState to match Support Library version am: 187964aca1 am: 4c24e4d831 am: fece305de0 am: cb362192e8 am: bc42f76941 am: c42091667c
  [automerger] Update internal ViewPager's SavedState to match Support Library version am: 187964aca1 am: 4c24e4d831 am: fece305de0 am: cb362192e8 am: bc42f76941
  [automerger] Update internal ViewPager's SavedState to match Support Library version am: 187964aca1 am: 4c24e4d831 am: fece305de0 am: cb362192e8
  [automerger] Update internal ViewPager's SavedState to match Support Library version am: 187964aca1 am: 4c24e4d831 am: fece305de0
  [automerger] Update internal ViewPager's SavedState to match Support Library version am: 187964aca1 am: 4c24e4d831
  [automerger] Update internal ViewPager's SavedState to match Support Library version am: 187964aca1
  Update internal ViewPager's SavedState to match Support Library version

commit | commitdiff | tree

Alan Viverette [Fri, 9 Mar 2018 18:43:02 +0000 (18:43 +0000)]

Merge changes from topic "viewpager_state" into nyc-mr1-dev

* changes:
  [automerger] Update internal ViewPager's SavedState to match Support Library version am: 187964aca1 am: 4c24e4d831 am: fece305de0 am: cb362192e8 am: bc42f76941 am: c42091667c
  [automerger] Update internal ViewPager's SavedState to match Support Library version am: 187964aca1 am: 4c24e4d831 am: fece305de0 am: cb362192e8 am: bc42f76941
  [automerger] Update internal ViewPager's SavedState to match Support Library version am: 187964aca1 am: 4c24e4d831 am: fece305de0 am: cb362192e8
  [automerger] Update internal ViewPager's SavedState to match Support Library version am: 187964aca1 am: 4c24e4d831 am: fece305de0
  [automerger] Update internal ViewPager's SavedState to match Support Library version am: 187964aca1 am: 4c24e4d831
  [automerger] Update internal ViewPager's SavedState to match Support Library version am: 187964aca1
  Update internal ViewPager's SavedState to match Support Library version

commit | commitdiff | tree

Alan Viverette [Fri, 9 Mar 2018 18:43:02 +0000 (18:43 +0000)]

Merge changes from topic "viewpager_state" into oc-dev

* changes:
  [automerger] Update internal ViewPager's SavedState to match Support Library version am: 187964aca1 am: 4c24e4d831 am: fece305de0 am: cb362192e8 am: bc42f76941 am: c42091667c am: aebf5c06df am: d04ccc6608 am: b3e984c412
  [automerger] Update internal ViewPager's SavedState to match Support Library version am: 187964aca1 am: 4c24e4d831 am: fece305de0 am: cb362192e8 am: bc42f76941 am: c42091667c am: aebf5c06df am: d04ccc6608
  [automerger] Update internal ViewPager's SavedState to match Support Library version am: 187964aca1 am: 4c24e4d831 am: fece305de0 am: cb362192e8 am: bc42f76941 am: c42091667c am: aebf5c06df
  [automerger] Update internal ViewPager's SavedState to match Support Library version am: 187964aca1 am: 4c24e4d831 am: fece305de0 am: cb362192e8 am: bc42f76941 am: c42091667c
  [automerger] Update internal ViewPager's SavedState to match Support Library version am: 187964aca1 am: 4c24e4d831 am: fece305de0 am: cb362192e8 am: bc42f76941
  [automerger] Update internal ViewPager's SavedState to match Support Library version am: 187964aca1 am: 4c24e4d831 am: fece305de0 am: cb362192e8
  [automerger] Update internal ViewPager's SavedState to match Support Library version am: 187964aca1 am: 4c24e4d831 am: fece305de0
  [automerger] Update internal ViewPager's SavedState to match Support Library version am: 187964aca1 am: 4c24e4d831
  [automerger] Update internal ViewPager's SavedState to match Support Library version am: 187964aca1
  Update internal ViewPager's SavedState to match Support Library version

commit | commitdiff | tree

Eugene Susla [Fri, 9 Mar 2018 18:42:08 +0000 (18:42 +0000)]

Merge changes from topic "recognition_service-mnc-dev" into nyc-dr1-dev

* changes:
  [automerger] [DO NOT MERGE] Copy PermissionChecker from support lib and use in RcognitionService am: 5a28e533fe am: b91acca082 am: 26aaadd3b5 skipped: a1ad0de1f7 am: cf92266ad9
  [automerger] [DO NOT MERGE] Copy PermissionChecker from support lib and use in RcognitionService am: 5a28e533fe am: b91acca082 am: 26aaadd3b5 skipped: a1ad0de1f7
  [automerger] [DO NOT MERGE] Copy PermissionChecker from support lib and use in RcognitionService am: 5a28e533fe am: b91acca082 am: 26aaadd3b5
  [automerger] [DO NOT MERGE] Copy PermissionChecker from support lib and use in RcognitionService am: 5a28e533fe am: b91acca082
  [automerger] [DO NOT MERGE] Copy PermissionChecker from support lib and use in RcognitionService am: 5a28e533fe
  [DO NOT MERGE] Copy PermissionChecker from support lib and use in RcognitionService

commit | commitdiff | tree

Eugene Susla [Fri, 9 Mar 2018 18:42:08 +0000 (18:42 +0000)]

Merge changes from topic "recognition_service-mnc-dev" into nyc-dev

* changes:
  [automerger] [DO NOT MERGE] Copy PermissionChecker from support lib and use in RcognitionService am: 5a28e533fe am: b91acca082 am: 26aaadd3b5 skipped: a1ad0de1f7
  [automerger] [DO NOT MERGE] Copy PermissionChecker from support lib and use in RcognitionService am: 5a28e533fe am: b91acca082 am: 26aaadd3b5
  [automerger] [DO NOT MERGE] Copy PermissionChecker from support lib and use in RcognitionService am: 5a28e533fe am: b91acca082
  [automerger] [DO NOT MERGE] Copy PermissionChecker from support lib and use in RcognitionService am: 5a28e533fe
  [DO NOT MERGE] Copy PermissionChecker from support lib and use in RcognitionService

commit | commitdiff | tree

Eugene Susla [Fri, 9 Mar 2018 18:42:08 +0000 (18:42 +0000)]

Merge changes from topic "recognition_service-mnc-dev" into nyc-mr2-dev

* changes:
  [automerger] [DO NOT MERGE] Copy PermissionChecker from support lib and use in RcognitionService am: 5a28e533fe am: b91acca082 am: 26aaadd3b5 skipped: a1ad0de1f7 am: cf92266ad9 am: 773f021348 am: bca318e527 am: 122f5e51bf
  [automerger] [DO NOT MERGE] Copy PermissionChecker from support lib and use in RcognitionService am: 5a28e533fe am: b91acca082 am: 26aaadd3b5 skipped: a1ad0de1f7 am: cf92266ad9 am: 773f021348 am: bca318e527
  [automerger] [DO NOT MERGE] Copy PermissionChecker from support lib and use in RcognitionService am: 5a28e533fe am: b91acca082 am: 26aaadd3b5 skipped: a1ad0de1f7 am: cf92266ad9 am: 773f021348
  [automerger] [DO NOT MERGE] Copy PermissionChecker from support lib and use in RcognitionService am: 5a28e533fe am: b91acca082 am: 26aaadd3b5 skipped: a1ad0de1f7 am: cf92266ad9
  [automerger] [DO NOT MERGE] Copy PermissionChecker from support lib and use in RcognitionService am: 5a28e533fe am: b91acca082 am: 26aaadd3b5 skipped: a1ad0de1f7
  [automerger] [DO NOT MERGE] Copy PermissionChecker from support lib and use in RcognitionService am: 5a28e533fe am: b91acca082 am: 26aaadd3b5
  [automerger] [DO NOT MERGE] Copy PermissionChecker from support lib and use in RcognitionService am: 5a28e533fe am: b91acca082
  [automerger] [DO NOT MERGE] Copy PermissionChecker from support lib and use in RcognitionService am: 5a28e533fe
  [DO NOT MERGE] Copy PermissionChecker from support lib and use in RcognitionService

commit | commitdiff | tree

Eugene Susla [Fri, 9 Mar 2018 18:42:08 +0000 (18:42 +0000)]

Merge changes from topic "recognition_service-mnc-dev" into cw-f-dev

* changes:
  [automerger] [DO NOT MERGE] Copy PermissionChecker from support lib and use in RcognitionService am: 5a28e533fe am: b91acca082 am: 26aaadd3b5 skipped: a1ad0de1f7 am: cf92266ad9 am: 773f021348 am: bca318e527
  [automerger] [DO NOT MERGE] Copy PermissionChecker from support lib and use in RcognitionService am: 5a28e533fe am: b91acca082 am: 26aaadd3b5 skipped: a1ad0de1f7 am: cf92266ad9 am: 773f021348
  [automerger] [DO NOT MERGE] Copy PermissionChecker from support lib and use in RcognitionService am: 5a28e533fe am: b91acca082 am: 26aaadd3b5 skipped: a1ad0de1f7 am: cf92266ad9
  [automerger] [DO NOT MERGE] Copy PermissionChecker from support lib and use in RcognitionService am: 5a28e533fe am: b91acca082 am: 26aaadd3b5 skipped: a1ad0de1f7
  [automerger] [DO NOT MERGE] Copy PermissionChecker from support lib and use in RcognitionService am: 5a28e533fe am: b91acca082 am: 26aaadd3b5
  [automerger] [DO NOT MERGE] Copy PermissionChecker from support lib and use in RcognitionService am: 5a28e533fe am: b91acca082
  [automerger] [DO NOT MERGE] Copy PermissionChecker from support lib and use in RcognitionService am: 5a28e533fe
  [DO NOT MERGE] Copy PermissionChecker from support lib and use in RcognitionService

commit | commitdiff | tree

Eugene Susla [Fri, 9 Mar 2018 18:42:08 +0000 (18:42 +0000)]

Merge changes from topic "recognition_service-mnc-dev" into nyc-mr1-dev

* changes:
  [automerger] [DO NOT MERGE] Copy PermissionChecker from support lib and use in RcognitionService am: 5a28e533fe am: b91acca082 am: 26aaadd3b5 skipped: a1ad0de1f7 am: cf92266ad9 am: 773f021348
  [automerger] [DO NOT MERGE] Copy PermissionChecker from support lib and use in RcognitionService am: 5a28e533fe am: b91acca082 am: 26aaadd3b5 skipped: a1ad0de1f7 am: cf92266ad9
  [automerger] [DO NOT MERGE] Copy PermissionChecker from support lib and use in RcognitionService am: 5a28e533fe am: b91acca082 am: 26aaadd3b5 skipped: a1ad0de1f7
  [automerger] [DO NOT MERGE] Copy PermissionChecker from support lib and use in RcognitionService am: 5a28e533fe am: b91acca082 am: 26aaadd3b5
  [automerger] [DO NOT MERGE] Copy PermissionChecker from support lib and use in RcognitionService am: 5a28e533fe am: b91acca082
  [automerger] [DO NOT MERGE] Copy PermissionChecker from support lib and use in RcognitionService am: 5a28e533fe
  [DO NOT MERGE] Copy PermissionChecker from support lib and use in RcognitionService

commit | commitdiff | tree

Eugene Susla [Fri, 9 Mar 2018 18:42:08 +0000 (18:42 +0000)]

Merge changes from topic "recognition_service-mnc-dev" into oc-dev

* changes:
  [automerger] [DO NOT MERGE] Copy PermissionChecker from support lib and use in RcognitionService am: 5a28e533fe am: b91acca082 am: 26aaadd3b5 skipped: a1ad0de1f7 am: cf92266ad9 am: 773f021348 am: bca318e527 am: 122f5e51bf skipped: 36e5764193
  [automerger] [DO NOT MERGE] Copy PermissionChecker from support lib and use in RcognitionService am: 5a28e533fe am: b91acca082 am: 26aaadd3b5 skipped: a1ad0de1f7 am: cf92266ad9 am: 773f021348 am: bca318e527 am: 122f5e51bf
  [automerger] [DO NOT MERGE] Copy PermissionChecker from support lib and use in RcognitionService am: 5a28e533fe am: b91acca082 am: 26aaadd3b5 skipped: a1ad0de1f7 am: cf92266ad9 am: 773f021348 am: bca318e527
  [automerger] [DO NOT MERGE] Copy PermissionChecker from support lib and use in RcognitionService am: 5a28e533fe am: b91acca082 am: 26aaadd3b5 skipped: a1ad0de1f7 am: cf92266ad9 am: 773f021348
  [automerger] [DO NOT MERGE] Copy PermissionChecker from support lib and use in RcognitionService am: 5a28e533fe am: b91acca082 am: 26aaadd3b5 skipped: a1ad0de1f7 am: cf92266ad9
  [automerger] [DO NOT MERGE] Copy PermissionChecker from support lib and use in RcognitionService am: 5a28e533fe am: b91acca082 am: 26aaadd3b5 skipped: a1ad0de1f7
  [automerger] [DO NOT MERGE] Copy PermissionChecker from support lib and use in RcognitionService am: 5a28e533fe am: b91acca082 am: 26aaadd3b5
  [automerger] [DO NOT MERGE] Copy PermissionChecker from support lib and use in RcognitionService am: 5a28e533fe am: b91acca082
  [automerger] [DO NOT MERGE] Copy PermissionChecker from support lib and use in RcognitionService am: 5a28e533fe
  [DO NOT MERGE] Copy PermissionChecker from support lib and use in RcognitionService

commit | commitdiff | tree

TreeHugger Robot [Fri, 9 Mar 2018 15:01:42 +0000 (15:01 +0000)]

Merge changes from topic "am-af991497-a243-423d-8f58-f6bc1131a734" into nyc-dr1-dev

* changes:
[automerger] [DO NOT MERGE] Add permission check to setAllowOnlyVpnForUids am: 41d8bf1fed
[DO NOT MERGE] Add permission check to setAllowOnlyVpnForUids

commit | commitdiff | tree

TreeHugger Robot [Fri, 9 Mar 2018 15:01:42 +0000 (15:01 +0000)]

Merge "[DO NOT MERGE] Add permission check to setAllowOnlyVpnForUids" into nyc-dev

commit | commitdiff | tree

TreeHugger Robot [Fri, 9 Mar 2018 15:01:42 +0000 (15:01 +0000)]

Merge changes from topic "am-af991497-a243-423d-8f58-f6bc1131a734" into nyc-mr2-dev

* changes:
  [automerger] [DO NOT MERGE] Add permission check to setAllowOnlyVpnForUids am: 41d8bf1fed am: 595f82f99e am: 3aaa23e1e2 am: 4b71619f50
  [automerger] [DO NOT MERGE] Add permission check to setAllowOnlyVpnForUids am: 41d8bf1fed am: 595f82f99e am: 3aaa23e1e2
  [automerger] [DO NOT MERGE] Add permission check to setAllowOnlyVpnForUids am: 41d8bf1fed am: 595f82f99e
  [automerger] [DO NOT MERGE] Add permission check to setAllowOnlyVpnForUids am: 41d8bf1fed
  [DO NOT MERGE] Add permission check to setAllowOnlyVpnForUids

commit | commitdiff | tree

TreeHugger Robot [Fri, 9 Mar 2018 15:01:42 +0000 (15:01 +0000)]

Merge changes from topic "am-af991497-a243-423d-8f58-f6bc1131a734" into cw-f-dev

* changes:
  [automerger] [DO NOT MERGE] Add permission check to setAllowOnlyVpnForUids am: 41d8bf1fed am: 595f82f99e am: 3aaa23e1e2
  [automerger] [DO NOT MERGE] Add permission check to setAllowOnlyVpnForUids am: 41d8bf1fed am: 595f82f99e
  [automerger] [DO NOT MERGE] Add permission check to setAllowOnlyVpnForUids am: 41d8bf1fed
  [DO NOT MERGE] Add permission check to setAllowOnlyVpnForUids

commit | commitdiff | tree

TreeHugger Robot [Fri, 9 Mar 2018 15:01:42 +0000 (15:01 +0000)]

Merge changes from topic "am-af991497-a243-423d-8f58-f6bc1131a734" into nyc-mr1-dev

* changes:
  [automerger] [DO NOT MERGE] Add permission check to setAllowOnlyVpnForUids am: 41d8bf1fed am: 595f82f99e
  [automerger] [DO NOT MERGE] Add permission check to setAllowOnlyVpnForUids am: 41d8bf1fed
  [DO NOT MERGE] Add permission check to setAllowOnlyVpnForUids

commit | commitdiff | tree

TreeHugger Robot [Fri, 9 Mar 2018 15:01:42 +0000 (15:01 +0000)]

Merge changes from topic "am-af991497-a243-423d-8f58-f6bc1131a734" into oc-dev

* changes:
  [automerger] [DO NOT MERGE] Add permission check to setAllowOnlyVpnForUids am: 41d8bf1fed am: 595f82f99e am: 3aaa23e1e2 am: 4b71619f50 skipped: d56e2e2cd0
  [automerger] [DO NOT MERGE] Add permission check to setAllowOnlyVpnForUids am: 41d8bf1fed am: 595f82f99e am: 3aaa23e1e2 am: 4b71619f50
  [automerger] [DO NOT MERGE] Add permission check to setAllowOnlyVpnForUids am: 41d8bf1fed am: 595f82f99e am: 3aaa23e1e2
  [automerger] [DO NOT MERGE] Add permission check to setAllowOnlyVpnForUids am: 41d8bf1fed am: 595f82f99e
  [automerger] [DO NOT MERGE] Add permission check to setAllowOnlyVpnForUids am: 41d8bf1fed
  [DO NOT MERGE] Add permission check to setAllowOnlyVpnForUids

commit | commitdiff | tree

Rubin Xu [Fri, 9 Mar 2018 14:59:30 +0000 (14:59 +0000)]

Merge "[DO NOT MERGE] Add permission check to setAllowOnlyVpnForUids" into oc-dev

commit | commitdiff | tree

Android Build Merger (Role) [Fri, 9 Mar 2018 04:19:32 +0000 (04:19 +0000)]

[automerger] Fixed Security Vulnerability of DcParamObject am: 8c55a70728 am: 61f84448eb am: a007cb0734 am: 3b356d5111 am: a61fe8f6c0 am: 3276de21ea am: bd60a681bf am: 5d5e5ca7cb am: f64ab1e93d

Change-Id: I8fc1082b7c6c64cf105246fe374260f72e83a7a8

commit | commitdiff | tree

Android Build Merger (Role) [Fri, 9 Mar 2018 04:19:26 +0000 (04:19 +0000)]

[automerger] Fixed Security Vulnerability of DcParamObject am: 8c55a70728 am: 61f84448eb am: a007cb0734 am: 3b356d5111 am: a61fe8f6c0 am: 3276de21ea am: bd60a681bf am: 5d5e5ca7cb

Change-Id: I3bd9d6f3d290ae125d57a4650b41b8ff6cbb5591

commit | commitdiff | tree

Android Build Merger (Role) [Fri, 9 Mar 2018 04:19:21 +0000 (04:19 +0000)]

[automerger] Fixed Security Vulnerability of DcParamObject am: 8c55a70728 am: 61f84448eb am: a007cb0734 am: 3b356d5111 am: a61fe8f6c0 am: 3276de21ea am: bd60a681bf

Change-Id: I8ad286f9218753d76d031f20e4f924de82abc5a1

commit | commitdiff | tree

Android Build Merger (Role) [Fri, 9 Mar 2018 04:19:16 +0000 (04:19 +0000)]

[automerger] Fixed Security Vulnerability of DcParamObject am: 8c55a70728 am: 61f84448eb am: a007cb0734 am: 3b356d5111 am: a61fe8f6c0 am: 3276de21ea

Change-Id: Ic702e9da64dc5aa8e66db22d72f070140c40bdf6

commit | commitdiff | tree

Android Build Merger (Role) [Fri, 9 Mar 2018 04:19:11 +0000 (04:19 +0000)]

[automerger] Fixed Security Vulnerability of DcParamObject am: 8c55a70728 am: 61f84448eb am: a007cb0734 am: 3b356d5111 am: a61fe8f6c0

Change-Id: I9206a21355732e408430ceae77d3095793a04072

commit | commitdiff | tree

Android Build Merger (Role) [Fri, 9 Mar 2018 04:19:00 +0000 (04:19 +0000)]

[automerger] Fixed Security Vulnerability of DcParamObject am: 8c55a70728 am: 61f84448eb am: a007cb0734 am: 3b356d5111

Change-Id: I96567f3adabce5207b07f71ac3b8fe60944a83f2

frameworks/base

About OSDN

Find Software

Develop Software

Help

Copyright ©OSDN Corporation All rights reserved.