diff options
| author | Andres Morales <anmorales@google.com> | 2015-04-14 16:12:48 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-04-14 16:12:55 +0000 |
| commit | 317918e206b89f4a49bfa35af57607764f322347 (patch) | |
| tree | f56545620e341f21a86eedff65090b8124bbc4ad /Android.mk | |
| parent | 34e79c1e570673148e3e0bbd91df3180a00eeff1 (diff) | |
| parent | d9fc85ac27742adbe89e54fd35f3cb2469e94b91 (diff) | |
| download | frameworks_base-317918e206b89f4a49bfa35af57607764f322347.zip frameworks_base-317918e206b89f4a49bfa35af57607764f322347.tar.gz frameworks_base-317918e206b89f4a49bfa35af57607764f322347.tar.bz2 | |
Merge changes from topic 'lss-update'
* changes:
Add challenge to IGateKeeperService
Wire up GateKeeper to LockSettingsService
Diffstat (limited to 'Android.mk')
| -rw-r--r-- | Android.mk | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -209,6 +209,7 @@ LOCAL_SRC_FILES += \ core/java/android/security/IKeystoreService.aidl \ core/java/android/service/carrier/ICarrierMessagingCallback.aidl \ core/java/android/service/carrier/ICarrierMessagingService.aidl \ + core/java/android/service/gatekeeper/IGateKeeperService.aidl \ core/java/android/service/notification/INotificationListener.aidl \ core/java/android/service/notification/IStatusBarNotificationHolder.aidl \ core/java/android/service/notification/IConditionListener.aidl \ |