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

OSDN Git Service

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

commit | commitdiff | tree

TreeHugger Robot [Fri, 13 Jul 2018 16:05:32 +0000 (16:05 +0000)]

Merge "vpn: allow IPSec traffic through Always-on VPN" into oc-dev

commit | commitdiff | tree

TreeHugger Robot [Thu, 12 Jul 2018 19:26:31 +0000 (19:26 +0000)]

Merge changes from topic "am-9f47cb6c-9cea-4b25-9f9b-e0e460e471ac" into oc-dev

* changes:
  [automerger skipped] Import translations. DO NOT MERGE skipped: f4037fb69e skipped: 741c97faa9
  [automerger skipped] Import translations. DO NOT MERGE skipped: f4037fb69e
  Import translations. DO NOT MERGE

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 12 Jul 2018 01:50:59 +0000 (01:50 +0000)]

[automerger skipped] Import translations. DO NOT MERGE skipped: e059d5fb83 skipped: e97378c657

Change-Id: I444e7a4567e0319e0a1999ca1a83418b14812d5d

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 12 Jul 2018 01:50:52 +0000 (01:50 +0000)]

[automerger skipped] Import translations. DO NOT MERGE skipped: e059d5fb83

Change-Id: I119e6fba2ffa56ca9a8b24df821025abf4bf9580

commit | commitdiff | tree

Bill Yi [Thu, 12 Jul 2018 01:50:30 +0000 (18:50 -0700)]

Import translations. DO NOT MERGE

Change-Id: I989a9b371c1dc0c713b67c0a8cef4f3bdc0c457c
Auto-generated-cl: translation import

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 11 Jul 2018 23:43:09 +0000 (23:43 +0000)]

[automerger skipped] Import translations. DO NOT MERGE skipped: f4037fb69e skipped: 741c97faa9

Change-Id: Ib3e6c7f2885ac23d45a68e7e20d981969067eb3b

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 11 Jul 2018 23:43:02 +0000 (23:43 +0000)]

[automerger skipped] Import translations. DO NOT MERGE skipped: f4037fb69e

Change-Id: I37e47c3e87c8e9143731af2b4bf0d92fc4ce7f38

commit | commitdiff | tree

Bill Yi [Wed, 11 Jul 2018 23:42:32 +0000 (16:42 -0700)]

Import translations. DO NOT MERGE

Change-Id: I9878d930e5aa4e4fe1883f28063e167240bb99b5
Auto-generated-cl: translation import

commit | commitdiff | tree

Android Build Merger (Role) [Fri, 6 Jul 2018 22:55:21 +0000 (22:55 +0000)]

[automerger] Resolve inconsistent parcel read in NanoAppFilter am: abe5a73a4a am: 2895b320b4 am: 77e6e34644 am: 49e97ea1dc am: c2cfe453f2

Change-Id: I6e3461125290f2835ff1f9a996beb92e64172386

commit | commitdiff | tree

Android Build Merger (Role) [Fri, 6 Jul 2018 22:55:14 +0000 (22:55 +0000)]

[automerger] Resolve inconsistent parcel read in NanoAppFilter am: abe5a73a4a am: 2895b320b4 am: 77e6e34644 am: 49e97ea1dc

Change-Id: I19c512999a0eae233e2cc7c4d31d0c62556e4ffd

commit | commitdiff | tree

Android Build Merger (Role) [Fri, 6 Jul 2018 22:55:07 +0000 (22:55 +0000)]

[automerger] Resolve inconsistent parcel read in NanoAppFilter am: abe5a73a4a am: 2895b320b4 am: 77e6e34644

Change-Id: I87ad6c5bad9275df8b1a131b3ac0daf7ec8ed5e4

commit | commitdiff | tree

Android Build Merger (Role) [Fri, 6 Jul 2018 22:55:02 +0000 (22:55 +0000)]

[automerger] Resolve inconsistent parcel read in NanoAppFilter am: abe5a73a4a am: 2895b320b4

Change-Id: I26b97af90ef6ea8b640ff7198b2883297d4fb03e

commit | commitdiff | tree

Android Build Merger (Role) [Fri, 6 Jul 2018 22:54:55 +0000 (22:54 +0000)]

[automerger] Resolve inconsistent parcel read in NanoAppFilter am: abe5a73a4a

Change-Id: Ieb925f073b80e4d624552e738d49b0996f0485ae

commit | commitdiff | tree

Arthur Ishiguro [Mon, 25 Jun 2018 18:31:33 +0000 (11:31 -0700)]

Resolve inconsistent parcel read in NanoAppFilter

Bug: 77599679
Test: Compile only
Change-Id: Ib417a5cb4d51744442d2fb14437cabbe5fd1c266

commit | commitdiff | tree

TreeHugger Robot [Fri, 6 Jul 2018 02:55:05 +0000 (02:55 +0000)]

Merge "Import translations. DO NOT MERGE" into cw-f-dev

commit | commitdiff | tree

TreeHugger Robot [Fri, 6 Jul 2018 02:55:05 +0000 (02:55 +0000)]

Merge changes from topic "am-59bde7f2-9903-448c-9ad1-8364ed396cf3" into oc-dev

* changes:
  [automerger skipped] Import translations. DO NOT MERGE skipped: c28b092c5e skipped: 33cf864720
  [automerger skipped] Import translations. DO NOT MERGE skipped: c28b092c5e
  Import translations. DO NOT MERGE

commit | commitdiff | tree

TreeHugger Robot [Fri, 6 Jul 2018 02:55:05 +0000 (02:55 +0000)]

Merge changes from topic "am-59bde7f2-9903-448c-9ad1-8364ed396cf3" into nyc-mr2-dev

* changes:
[automerger skipped] Import translations. DO NOT MERGE skipped: c28b092c5e
Import translations. DO NOT MERGE

commit | commitdiff | tree

TreeHugger Robot [Fri, 6 Jul 2018 02:50:29 +0000 (02:50 +0000)]

Merge "Import translations. DO NOT MERGE" into cw-f-dev

commit | commitdiff | tree

TreeHugger Robot [Fri, 6 Jul 2018 02:50:29 +0000 (02:50 +0000)]

Merge changes from topic "am-8b8b3d01-a327-4923-ae09-35940a00b1b3" into oc-dev

* changes:
  [automerger skipped] Import translations. DO NOT MERGE skipped: e35f1fdbae skipped: 39c48a1168
  [automerger skipped] Import translations. DO NOT MERGE skipped: e35f1fdbae
  Import translations. DO NOT MERGE

commit | commitdiff | tree

TreeHugger Robot [Fri, 6 Jul 2018 02:50:29 +0000 (02:50 +0000)]

Merge changes from topic "am-8b8b3d01-a327-4923-ae09-35940a00b1b3" into nyc-mr2-dev

* changes:
[automerger skipped] Import translations. DO NOT MERGE skipped: e35f1fdbae
Import translations. DO NOT MERGE

commit | commitdiff | tree

TreeHugger Robot [Fri, 6 Jul 2018 02:46:51 +0000 (02:46 +0000)]

Merge "Import translations. DO NOT MERGE" into cw-f-dev

commit | commitdiff | tree

TreeHugger Robot [Fri, 6 Jul 2018 02:46:51 +0000 (02:46 +0000)]

Merge changes from topic "am-5c22e81a-5f3d-46c4-9d8f-58c6edfac103" into oc-dev

* changes:
  [automerger skipped] Import translations. DO NOT MERGE skipped: ff2f705557 skipped: 4740838b56
  [automerger skipped] Import translations. DO NOT MERGE skipped: ff2f705557
  Import translations. DO NOT MERGE

commit | commitdiff | tree

TreeHugger Robot [Fri, 6 Jul 2018 02:46:51 +0000 (02:46 +0000)]

Merge changes from topic "am-5c22e81a-5f3d-46c4-9d8f-58c6edfac103" into nyc-mr2-dev

* changes:
[automerger skipped] Import translations. DO NOT MERGE skipped: ff2f705557
Import translations. DO NOT MERGE

commit | commitdiff | tree

TreeHugger Robot [Fri, 6 Jul 2018 02:46:29 +0000 (02:46 +0000)]

Merge "Import translations. DO NOT MERGE" into cw-f-dev

commit | commitdiff | tree

TreeHugger Robot [Fri, 6 Jul 2018 02:46:29 +0000 (02:46 +0000)]

Merge changes from topic "am-dd912fb1-a10b-413b-b531-a015abbbf9e3" into oc-dev

* changes:
  [automerger skipped] Import translations. DO NOT MERGE skipped: f02d29629d skipped: ace44c1ee6
  [automerger skipped] Import translations. DO NOT MERGE skipped: f02d29629d
  Import translations. DO NOT MERGE

commit | commitdiff | tree

TreeHugger Robot [Fri, 6 Jul 2018 02:46:29 +0000 (02:46 +0000)]

Merge changes from topic "am-dd912fb1-a10b-413b-b531-a015abbbf9e3" into nyc-mr2-dev

* changes:
[automerger skipped] Import translations. DO NOT MERGE skipped: f02d29629d
Import translations. DO NOT MERGE

commit | commitdiff | tree

TreeHugger Robot [Fri, 6 Jul 2018 02:45:57 +0000 (02:45 +0000)]

Merge "Import translations. DO NOT MERGE" into cw-f-dev

commit | commitdiff | tree

TreeHugger Robot [Fri, 6 Jul 2018 02:45:57 +0000 (02:45 +0000)]

Merge changes from topic "am-20b78215-c47d-481a-9e96-79127da1c87c" into oc-dev

* changes:
  [automerger skipped] Import translations. DO NOT MERGE skipped: 32c08741ec skipped: 8062f299b1
  [automerger skipped] Import translations. DO NOT MERGE skipped: 32c08741ec
  Import translations. DO NOT MERGE

commit | commitdiff | tree

TreeHugger Robot [Fri, 6 Jul 2018 02:45:57 +0000 (02:45 +0000)]

Merge changes from topic "am-20b78215-c47d-481a-9e96-79127da1c87c" into nyc-mr2-dev

* changes:
[automerger skipped] Import translations. DO NOT MERGE skipped: 32c08741ec
Import translations. DO NOT MERGE

commit | commitdiff | tree

TreeHugger Robot [Fri, 6 Jul 2018 02:45:27 +0000 (02:45 +0000)]

Merge "Import translations. DO NOT MERGE" into cw-f-dev

commit | commitdiff | tree

TreeHugger Robot [Fri, 6 Jul 2018 02:45:27 +0000 (02:45 +0000)]

Merge changes from topic "am-5f59ad6e-1c79-44f8-a437-eac2cc321cdf" into oc-dev

* changes:
  [automerger skipped] Import translations. DO NOT MERGE skipped: cd4aea64f6 skipped: f028c34cdc
  [automerger skipped] Import translations. DO NOT MERGE skipped: cd4aea64f6
  Import translations. DO NOT MERGE

commit | commitdiff | tree

TreeHugger Robot [Fri, 6 Jul 2018 02:45:27 +0000 (02:45 +0000)]

Merge changes from topic "am-5f59ad6e-1c79-44f8-a437-eac2cc321cdf" into nyc-mr2-dev

* changes:
[automerger skipped] Import translations. DO NOT MERGE skipped: cd4aea64f6
Import translations. DO NOT MERGE

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 5 Jul 2018 22:39:37 +0000 (22:39 +0000)]

[automerger skipped] Import translations. DO NOT MERGE skipped: e35f1fdbae skipped: 39c48a1168

Change-Id: I2850da8ee89c8ed1dcfc7fc443eb8a2dcb6346bd

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 5 Jul 2018 22:39:28 +0000 (22:39 +0000)]

[automerger skipped] Import translations. DO NOT MERGE skipped: e35f1fdbae

Change-Id: I66b3bb58351d966fbe38e7448c985206e73af9d5

commit | commitdiff | tree

Bill Yi [Thu, 5 Jul 2018 22:38:55 +0000 (15:38 -0700)]

Import translations. DO NOT MERGE

Change-Id: I3ce8cc748d098e3854a7c2b19cdc0d0fe4281288
Auto-generated-cl: translation import

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 5 Jul 2018 21:45:40 +0000 (21:45 +0000)]

[automerger skipped] Import translations. DO NOT MERGE skipped: cd4aea64f6 skipped: f028c34cdc

Change-Id: I5c0a1faf8d1dc7bf5d6fc831b61ab40697a422d5

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 5 Jul 2018 21:45:32 +0000 (21:45 +0000)]

[automerger skipped] Import translations. DO NOT MERGE skipped: cd4aea64f6

Change-Id: I8ba42b65a49ff3e9c30e56dc8664bc8a942b4d25

commit | commitdiff | tree

Bill Yi [Thu, 5 Jul 2018 21:45:03 +0000 (14:45 -0700)]

Import translations. DO NOT MERGE

Change-Id: Ib37886b826a61cf234e745494df8f57f58aafda6
Auto-generated-cl: translation import

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 5 Jul 2018 21:38:44 +0000 (21:38 +0000)]

[automerger skipped] Import translations. DO NOT MERGE skipped: 32c08741ec skipped: 8062f299b1

Change-Id: I99aab27eecf8e8d5d092cabc316b0d3b68a97b2c

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 5 Jul 2018 21:38:36 +0000 (21:38 +0000)]

[automerger skipped] Import translations. DO NOT MERGE skipped: 32c08741ec

Change-Id: I09e334aa2acf3c0d32b27b9d18193450db041c6a

commit | commitdiff | tree

Bill Yi [Thu, 5 Jul 2018 21:38:05 +0000 (14:38 -0700)]

Import translations. DO NOT MERGE

Change-Id: Ie2a754e3f768b2de4d5ead7c9809143a0208a323
Auto-generated-cl: translation import

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 5 Jul 2018 21:26:20 +0000 (21:26 +0000)]

[automerger skipped] Import translations. DO NOT MERGE skipped: f02d29629d skipped: ace44c1ee6

Change-Id: I264d10bc17ca14d813f7626ea8c7f3fc48b7d2b7

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 5 Jul 2018 21:26:12 +0000 (21:26 +0000)]

[automerger skipped] Import translations. DO NOT MERGE skipped: f02d29629d

Change-Id: I19af9b73c3da999252d25aa656b2ee5898b75662

commit | commitdiff | tree

Bill Yi [Thu, 5 Jul 2018 21:25:39 +0000 (14:25 -0700)]

Import translations. DO NOT MERGE

Change-Id: I3f4f14ff10346e7bd3ce6ae49fb7d62b0b97b29f
Auto-generated-cl: translation import

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 5 Jul 2018 20:56:37 +0000 (20:56 +0000)]

[automerger skipped] Import translations. DO NOT MERGE skipped: ff2f705557 skipped: 4740838b56

Change-Id: I2021f802764dc2314c721ba918c587f235b0f575

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 5 Jul 2018 20:56:29 +0000 (20:56 +0000)]

[automerger skipped] Import translations. DO NOT MERGE skipped: ff2f705557

Change-Id: Ia499ffa8340bfbf0f2b1ec7dd515ee5cf65f7fb8

commit | commitdiff | tree

Bill Yi [Thu, 5 Jul 2018 20:55:54 +0000 (13:55 -0700)]

Import translations. DO NOT MERGE

Change-Id: Ie0db7263c998f8b70aa35b99d5207ceab763f25c
Auto-generated-cl: translation import

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 5 Jul 2018 20:32:02 +0000 (20:32 +0000)]

[automerger skipped] Import translations. DO NOT MERGE skipped: f8ecf21228 skipped: b586d4e9ab

Change-Id: Idb16f83382ec0d792c15733b46fe31a99e89552a

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 5 Jul 2018 20:31:54 +0000 (20:31 +0000)]

[automerger skipped] Import translations. DO NOT MERGE skipped: f8ecf21228

Change-Id: Ie556d4be250c4d6f4ade238bb905455aa0454b73

commit | commitdiff | tree

Bill Yi [Thu, 5 Jul 2018 20:31:17 +0000 (13:31 -0700)]

Import translations. DO NOT MERGE

Change-Id: If9dfa14b67b352f0e43cec9c151e75bcaa361e4d
Auto-generated-cl: translation import

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 5 Jul 2018 20:25:00 +0000 (20:25 +0000)]

[automerger skipped] Import translations. DO NOT MERGE skipped: c28b092c5e skipped: 33cf864720

Change-Id: I0ff7f8debdd8198ed8e4b61898a27ba116b013f7

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 5 Jul 2018 20:24:50 +0000 (20:24 +0000)]

[automerger skipped] Import translations. DO NOT MERGE skipped: c28b092c5e

Change-Id: I8214434dd8cb7b4e173b0ff49e3b5bf7618125f2

commit | commitdiff | tree

Bill Yi [Thu, 5 Jul 2018 20:24:08 +0000 (13:24 -0700)]

Import translations. DO NOT MERGE

Change-Id: I49d05b7d8f35cccb3dfe0fef1b04f5e08490e7de
Auto-generated-cl: translation import

commit | commitdiff | tree

Bernie Innocenti [Mon, 28 May 2018 13:04:37 +0000 (22:04 +0900)]

vpn: allow IPSec traffic through Always-on VPN

This won't leak any traffic outside the VPN as long as there are no
processes owned by uid 0 which generate network traffic (which is
currently the case).

Bug: 69873852
Test: compared the output of 'adb shell ip rule show' before and after
Test: runtest -x frameworks/base/tests/net/java/com/android/server/connectivity/VpnTest.java
Test: local CTS tests run: android.net.cts.VpnServiceTest
Test: local CTS tests run: com.android.cts.devicepolicy.MixedDeviceOwnerTest
Change-Id: I8758e576c9d961d73f62bfcf0559dd7ecee6e8e6
Merged-In: I8758e576c9d961d73f62bfcf0559dd7ecee6e8e6
Merged-In: I1f9b78c8f828ec2df7aba71b39d62be0c4db2550
Merged-In: I8edeb0942e661c8385ff0cd3fdb72e6f62a8f218
(cherry picked from commit 00000fe55a4729f8339afdc7eab5c970b2549813)

commit | commitdiff | tree

Atanas Kirilov [Wed, 27 Jun 2018 23:29:41 +0000 (23:29 +0000)]

Merge "RESTRICT AUTOMERGE: Prevent shortcut info package name spoofing" into nyc-mr1-dev

commit | commitdiff | tree

Atanas Kirilov [Wed, 27 Jun 2018 23:29:41 +0000 (23:29 +0000)]

Merge changes from topic "am-32ac52b1-d1ae-4650-b9ae-368d8cd519cb" into oc-dev

* changes:
  [automerger] RESTRICT AUTOMERGE: Prevent shortcut info package name spoofing am: 2f7d50058a am: 06848a3f8f skipped: c3e741e530
  [automerger] RESTRICT AUTOMERGE: Prevent shortcut info package name spoofing am: 2f7d50058a am: 06848a3f8f
  [automerger] RESTRICT AUTOMERGE: Prevent shortcut info package name spoofing am: 2f7d50058a
  RESTRICT AUTOMERGE: Prevent shortcut info package name spoofing

commit | commitdiff | tree

Atanas Kirilov [Wed, 27 Jun 2018 23:29:41 +0000 (23:29 +0000)]

Merge changes from topic "am-32ac52b1-d1ae-4650-b9ae-368d8cd519cb" into nyc-mr2-dev

* changes:
  [automerger] RESTRICT AUTOMERGE: Prevent shortcut info package name spoofing am: 2f7d50058a am: 06848a3f8f
  [automerger] RESTRICT AUTOMERGE: Prevent shortcut info package name spoofing am: 2f7d50058a
  RESTRICT AUTOMERGE: Prevent shortcut info package name spoofing

commit | commitdiff | tree

Atanas Kirilov [Wed, 27 Jun 2018 23:29:41 +0000 (23:29 +0000)]

Merge changes from topic "am-32ac52b1-d1ae-4650-b9ae-368d8cd519cb" into cw-f-dev

* changes:
[automerger] RESTRICT AUTOMERGE: Prevent shortcut info package name spoofing am: 2f7d50058a
RESTRICT AUTOMERGE: Prevent shortcut info package name spoofing

commit | commitdiff | tree

Atanas Kirilov [Wed, 27 Jun 2018 23:26:08 +0000 (23:26 +0000)]

Merge "Backport Prevent shortcut info package name spoofing" into oc-dev

commit | commitdiff | tree

Atanas Kirilov [Wed, 27 Jun 2018 23:25:42 +0000 (23:25 +0000)]

Merge changes from topic "am-8acf63d1-cfe0-4950-98c3-1d2367987749" into nyc-mr2-dev

* changes:
  [automerger] RESTRICT AUTOMERGE: Backporting of b/77821568 am: 4bc1c2445c am: b9c3b099e4 am: 24d402096e am: 0eda2602cd
  [automerger] RESTRICT AUTOMERGE: Backporting of b/77821568 am: 4bc1c2445c am: b9c3b099e4 am: 24d402096e
  [automerger] RESTRICT AUTOMERGE: Backporting of b/77821568 am: 4bc1c2445c am: b9c3b099e4
  [automerger] RESTRICT AUTOMERGE: Backporting of b/77821568 am: 4bc1c2445c
  RESTRICT AUTOMERGE: Backporting of b/77821568

commit | commitdiff | tree

Atanas Kirilov [Wed, 27 Jun 2018 23:25:42 +0000 (23:25 +0000)]

Merge changes from topic "am-8acf63d1-cfe0-4950-98c3-1d2367987749" into cw-f-dev

* changes:
  [automerger] RESTRICT AUTOMERGE: Backporting of b/77821568 am: 4bc1c2445c am: b9c3b099e4 am: 24d402096e
  [automerger] RESTRICT AUTOMERGE: Backporting of b/77821568 am: 4bc1c2445c am: b9c3b099e4
  [automerger] RESTRICT AUTOMERGE: Backporting of b/77821568 am: 4bc1c2445c
  RESTRICT AUTOMERGE: Backporting of b/77821568

commit | commitdiff | tree

Atanas Kirilov [Wed, 27 Jun 2018 23:25:42 +0000 (23:25 +0000)]

Merge changes from topic "am-8acf63d1-cfe0-4950-98c3-1d2367987749" into oc-dev

* changes:
  [automerger] RESTRICT AUTOMERGE: Backporting of b/77821568 am: 4bc1c2445c am: b9c3b099e4 am: 24d402096e am: 0eda2602cd skipped: 430c4395a3
  [automerger] RESTRICT AUTOMERGE: Backporting of b/77821568 am: 4bc1c2445c am: b9c3b099e4 am: 24d402096e am: 0eda2602cd
  [automerger] RESTRICT AUTOMERGE: Backporting of b/77821568 am: 4bc1c2445c am: b9c3b099e4 am: 24d402096e
  [automerger] RESTRICT AUTOMERGE: Backporting of b/77821568 am: 4bc1c2445c am: b9c3b099e4
  [automerger] RESTRICT AUTOMERGE: Backporting of b/77821568 am: 4bc1c2445c
  RESTRICT AUTOMERGE: Backporting of b/77821568

commit | commitdiff | tree

Atanas Kirilov [Wed, 27 Jun 2018 23:25:27 +0000 (23:25 +0000)]

Merge "Backporting of b/77821568" into oc-dev

commit | commitdiff | tree

TreeHugger Robot [Mon, 18 Jun 2018 06:27:04 +0000 (06:27 +0000)]

Merge changes from topic "am-aabaca13-84ab-4de5-bfa1-2add13867c06" into nyc-mr2-dev

* changes:
[automerger skipped] Import translations. DO NOT MERGE skipped: 422582d9c4
Import translations. DO NOT MERGE

commit | commitdiff | tree

TreeHugger Robot [Mon, 18 Jun 2018 06:27:04 +0000 (06:27 +0000)]

Merge "Import translations. DO NOT MERGE" into cw-f-dev

commit | commitdiff | tree

TreeHugger Robot [Mon, 18 Jun 2018 06:27:04 +0000 (06:27 +0000)]

Merge changes from topic "am-aabaca13-84ab-4de5-bfa1-2add13867c06" into oc-dev

* changes:
  [automerger skipped] Import translations. DO NOT MERGE skipped: 422582d9c4 skipped: b06ba83b23
  [automerger skipped] Import translations. DO NOT MERGE skipped: 422582d9c4
  Import translations. DO NOT MERGE

commit | commitdiff | tree

Android Build Merger (Role) [Sun, 17 Jun 2018 12:14:12 +0000 (12:14 +0000)]

[automerger skipped] Import translations. DO NOT MERGE skipped: 422582d9c4 skipped: b06ba83b23

Change-Id: Iae0ad51f828f91b8211e0671900f2ffa1265c655

commit | commitdiff | tree

Android Build Merger (Role) [Sun, 17 Jun 2018 12:14:05 +0000 (12:14 +0000)]

[automerger skipped] Import translations. DO NOT MERGE skipped: 422582d9c4

Change-Id: I3f93da28223af89a03736689e7f35a723b864ff5

commit | commitdiff | tree

Bill Yi [Sun, 17 Jun 2018 12:13:32 +0000 (05:13 -0700)]

Import translations. DO NOT MERGE

Change-Id: I681a0e79a709f3cabf8b661ec5229480d99dd840
Auto-generated-cl: translation import

commit | commitdiff | tree

Android Build Merger (Role) [Sun, 17 Jun 2018 10:03:39 +0000 (10:03 +0000)]

[automerger skipped] Import translations. DO NOT MERGE skipped: cbc81e618d skipped: 693ad9800b

Change-Id: I387f439df9441d64a658344837e4a2bd0f88a128

commit | commitdiff | tree

Android Build Merger (Role) [Sun, 17 Jun 2018 10:03:31 +0000 (10:03 +0000)]

[automerger skipped] Import translations. DO NOT MERGE skipped: cbc81e618d

Change-Id: I6a3ddad855bdc4ae74eab3e6e2cd42290176aab4

commit | commitdiff | tree

Bill Yi [Sun, 17 Jun 2018 10:02:56 +0000 (03:02 -0700)]

Import translations. DO NOT MERGE

Change-Id: Ied5693d3e59e24f43a7a1577471819c269c7d6df
Auto-generated-cl: translation import

commit | commitdiff | tree

Makoto Onuki [Tue, 12 Jun 2018 20:01:42 +0000 (13:01 -0700)]

Backport Prevent shortcut info package name spoofing

Test: cts-tradefed run cts -m CtsShortcutManagerTestCases -t android.content.pm.cts.shortcutmanager.ShortcutManagerFakingPublisherTest
Bug: 109824443

Change-Id: I90443973aaef157d357b98b739572866125b2bbc
Merged-In: I78948446a63b428ae750464194558fd44a658493

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 13 Jun 2018 21:43:03 +0000 (21:43 +0000)]

[automerger] RESTRICT AUTOMERGE: Prevent shortcut info package name spoofing am: 2f7d50058a am: 06848a3f8f skipped: c3e741e530

Change-Id: I7aaf06ed4a169b6db7857a6eaa79358cfce7054b

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 13 Jun 2018 21:42:56 +0000 (21:42 +0000)]

[automerger] RESTRICT AUTOMERGE: Prevent shortcut info package name spoofing am: 2f7d50058a am: 06848a3f8f

Change-Id: I0c720e9e4186238ba33eeceae2da377ba2831c29

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 13 Jun 2018 21:42:48 +0000 (21:42 +0000)]

[automerger] RESTRICT AUTOMERGE: Prevent shortcut info package name spoofing am: 2f7d50058a

Change-Id: I1a8b7786bd91bf8c585da02891dad3ceee9db393

commit | commitdiff | tree

Makoto Onuki [Tue, 12 Jun 2018 20:01:42 +0000 (13:01 -0700)]

RESTRICT AUTOMERGE: Prevent shortcut info package name spoofing

Test: cts-tradefed run cts -m CtsShortcutManagerTestCases -t android.content.pm.cts.shortcutmanager.ShortcutManagerFakingPublisherTest
Bug: 109824443
Change-Id: I80b2680d9c7e067f1a36fc8ad1aac1d315022a71

commit | commitdiff | tree

Hongming Jin [Fri, 18 May 2018 17:47:57 +0000 (10:47 -0700)]

Backporting of b/77821568

Enforce permission check before returning application info
Test: manually tested (see bug for repro steps)
Bug: 77821568

Change-Id: Iec13196250f0e5d8b54fd7060ed40e3fe3fe2827
Merged-In: I7554805c36c0c2552163dad7b07cfc5f552b624e

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 13 Jun 2018 18:09:48 +0000 (18:09 +0000)]

[automerger] RESTRICT AUTOMERGE: Backporting of b/77821568 am: 4bc1c2445c am: b9c3b099e4 am: 24d402096e am: 0eda2602cd skipped: 430c4395a3

Change-Id: I38571525dec3ebc35284cc9a8ae0044a8e9e237c

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 13 Jun 2018 18:09:40 +0000 (18:09 +0000)]

[automerger] RESTRICT AUTOMERGE: Backporting of b/77821568 am: 4bc1c2445c am: b9c3b099e4 am: 24d402096e am: 0eda2602cd

Change-Id: I9692df95413c51715508b664b5bc3ea02462da55

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 13 Jun 2018 18:09:32 +0000 (18:09 +0000)]

[automerger] RESTRICT AUTOMERGE: Backporting of b/77821568 am: 4bc1c2445c am: b9c3b099e4 am: 24d402096e

Change-Id: Ia7340c71283b7f88378e34584b373cce180262ec

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 13 Jun 2018 18:09:24 +0000 (18:09 +0000)]

[automerger] RESTRICT AUTOMERGE: Backporting of b/77821568 am: 4bc1c2445c am: b9c3b099e4

Change-Id: I8a090de1075d6d30590ac1e535de841164753758

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 13 Jun 2018 18:09:16 +0000 (18:09 +0000)]

[automerger] RESTRICT AUTOMERGE: Backporting of b/77821568 am: 4bc1c2445c

Change-Id: I12a6a00f11b2d94d3ac112a2f18284e13062a814

commit | commitdiff | tree

akirilov [Thu, 7 Jun 2018 21:36:25 +0000 (14:36 -0700)]

RESTRICT AUTOMERGE: Backporting of b/77821568

Enforce permission check before returning application info
Test: manually tested (see bug for repro steps)
Bug: 77821568

Change-Id: I5d81345b2d958c2bb0a62bbcb8bd8c714a1cf41e

commit | commitdiff | tree

TreeHugger Robot [Mon, 11 Jun 2018 18:19:38 +0000 (18:19 +0000)]

Merge changes from topic "am-8bf63f1b-ab99-4537-ad90-d648a4dd77b0" into oc-dev

* changes:
  [automerger skipped] Import translations. DO NOT MERGE skipped: 9f043e5e58 skipped: cc2c91ba39
  [automerger skipped] Import translations. DO NOT MERGE skipped: 9f043e5e58
  Import translations. DO NOT MERGE

commit | commitdiff | tree

TreeHugger Robot [Mon, 11 Jun 2018 18:19:38 +0000 (18:19 +0000)]

Merge changes from topic "am-8bf63f1b-ab99-4537-ad90-d648a4dd77b0" into nyc-mr2-dev

* changes:
[automerger skipped] Import translations. DO NOT MERGE skipped: 9f043e5e58
Import translations. DO NOT MERGE

commit | commitdiff | tree

TreeHugger Robot [Mon, 11 Jun 2018 18:19:38 +0000 (18:19 +0000)]

Merge "Import translations. DO NOT MERGE" into cw-f-dev

commit | commitdiff | tree

TreeHugger Robot [Mon, 11 Jun 2018 18:11:29 +0000 (18:11 +0000)]

Merge changes from topic "am-8eb97afa-063a-44e2-8d8e-6d5670eb50b6" into oc-dev

* changes:
  [automerger skipped] Import translations. DO NOT MERGE skipped: 5e25fd88a8 skipped: c6a1d32ebe
  [automerger skipped] Import translations. DO NOT MERGE skipped: 5e25fd88a8
  Import translations. DO NOT MERGE

commit | commitdiff | tree

TreeHugger Robot [Mon, 11 Jun 2018 18:11:29 +0000 (18:11 +0000)]

Merge changes from topic "am-8eb97afa-063a-44e2-8d8e-6d5670eb50b6" into nyc-mr2-dev

* changes:
[automerger skipped] Import translations. DO NOT MERGE skipped: 5e25fd88a8
Import translations. DO NOT MERGE

commit | commitdiff | tree

TreeHugger Robot [Mon, 11 Jun 2018 18:11:29 +0000 (18:11 +0000)]

Merge "Import translations. DO NOT MERGE" into cw-f-dev

commit | commitdiff | tree

TreeHugger Robot [Mon, 11 Jun 2018 18:06:41 +0000 (18:06 +0000)]

Merge changes from topic "am-63639373-f180-4cce-87e9-95ef192ab9ec" into oc-dev

* changes:
  [automerger skipped] Import translations. DO NOT MERGE skipped: 0be149db42 skipped: 3c2edd55ce
  [automerger skipped] Import translations. DO NOT MERGE skipped: 0be149db42
  Import translations. DO NOT MERGE

commit | commitdiff | tree

TreeHugger Robot [Mon, 11 Jun 2018 18:06:41 +0000 (18:06 +0000)]

Merge changes from topic "am-63639373-f180-4cce-87e9-95ef192ab9ec" into nyc-mr2-dev

* changes:
[automerger skipped] Import translations. DO NOT MERGE skipped: 0be149db42
Import translations. DO NOT MERGE

commit | commitdiff | tree

TreeHugger Robot [Mon, 11 Jun 2018 18:06:41 +0000 (18:06 +0000)]

Merge "Import translations. DO NOT MERGE" into cw-f-dev

commit | commitdiff | tree

TreeHugger Robot [Mon, 11 Jun 2018 18:05:42 +0000 (18:05 +0000)]

Merge changes from topic "am-da3e9584-98c5-4975-8207-a77d2301579a" into oc-dev

* changes:
  [automerger skipped] Import translations. DO NOT MERGE skipped: 05238c7743 skipped: 5e66cc00a4
  [automerger skipped] Import translations. DO NOT MERGE skipped: 05238c7743
  Import translations. DO NOT MERGE

commit | commitdiff | tree

TreeHugger Robot [Mon, 11 Jun 2018 18:05:42 +0000 (18:05 +0000)]

Merge changes from topic "am-da3e9584-98c5-4975-8207-a77d2301579a" into nyc-mr2-dev

* changes:
[automerger skipped] Import translations. DO NOT MERGE skipped: 05238c7743
Import translations. DO NOT MERGE

commit | commitdiff | tree

TreeHugger Robot [Mon, 11 Jun 2018 18:05:42 +0000 (18:05 +0000)]

Merge "Import translations. DO NOT MERGE" into cw-f-dev

commit | commitdiff | tree

TreeHugger Robot [Mon, 11 Jun 2018 18:03:31 +0000 (18:03 +0000)]

Merge changes from topic "am-84e9fe64-a976-466c-a8d7-d25febc3ff42" into oc-dev

* changes:
  [automerger skipped] Import translations. DO NOT MERGE skipped: 1122b10e7d skipped: ab4ca0c33d
  [automerger skipped] Import translations. DO NOT MERGE skipped: 1122b10e7d
  Import translations. DO NOT MERGE

commit | commitdiff | tree

TreeHugger Robot [Mon, 11 Jun 2018 18:03:31 +0000 (18:03 +0000)]

Merge changes from topic "am-84e9fe64-a976-466c-a8d7-d25febc3ff42" into nyc-mr2-dev

* changes:
[automerger skipped] Import translations. DO NOT MERGE skipped: 1122b10e7d
Import translations. DO NOT MERGE

commit | commitdiff | tree

TreeHugger Robot [Mon, 11 Jun 2018 18:03:31 +0000 (18:03 +0000)]

Merge "Import translations. DO NOT MERGE" into cw-f-dev

commit | commitdiff | tree

TreeHugger Robot [Mon, 11 Jun 2018 18:03:15 +0000 (18:03 +0000)]

Merge changes from topic "am-f1c23412-1f54-4840-90d6-b3eb7b06fc83" into oc-dev

* changes:
  [automerger skipped] Import translations. DO NOT MERGE skipped: ce28dfa9fa skipped: 4f7095b464
  [automerger skipped] Import translations. DO NOT MERGE skipped: ce28dfa9fa
  Import translations. DO NOT MERGE

frameworks/base

RSS Atom

About OSDN

Find Software

Develop Software

Help