OSDN Git Service

DO NOT MERGE Backporting potential usb tapjacking precaution.
authorBeverly <beverlyt@google.com>
Fri, 1 Sep 2017 18:56:50 +0000 (14:56 -0400)
committerBeverly Tai <beverlyt@google.com>
Tue, 12 Sep 2017 17:22:38 +0000 (17:22 +0000)
commite012d705dd8172048c3f32113b2a671847e3d1a2
tree2d6e17dfe75dabcb5468e9e632df6933eb57380a
parente274cd7ae90ae02fa7b8c70466338869b4ffc6c8
DO NOT MERGE Backporting potential usb tapjacking precaution.

Bug: 62187985
Test: manual, backport
Change-Id: Iaceff6bb1da5fbf3d80a8e85923199bd8cab06bd
MERGED-IN: I3bdcd1876cd6dbe8a728bbce74edb52ab79f3e4c
MERGED-IN: Ic58ddd6d54e96f522445e67b90760dcfed13c27d
packages/SystemUI/res/values/strings.xml
packages/SystemUI/src/com/android/systemui/usb/UsbDebuggingActivity.java