OSDN Git Service

Add back the throwIfParentInstance checking in getAffiliationIds
authorTony Mak <tonymak@google.com>
Tue, 2 May 2017 12:50:18 +0000 (13:50 +0100)
committerTony Mak <tonymak@google.com>
Tue, 2 May 2017 13:42:30 +0000 (13:42 +0000)
commit62cf5861592dc283cbcdac43e70be786f19869ce
tree0491563aa42b937e260e81b252dba1ae02cf3312
parent90074d1ec8837daef0044137eca8822e4dbc262f
Add back the throwIfParentInstance checking in getAffiliationIds

Fix: 37887947

Test: cts-tradefed run cts-dev --module DevicePolicyManager --test com.android.cts.devicepolicy.ParentProfileTest#testParentProfileApiDisabled

Change-Id: I05944c7a2447998d3ea948195fb25b09ab9735fc
core/java/android/app/admin/DevicePolicyManager.java