summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdnan Begovic <adnan@cyngn.com>2015-06-25 12:58:04 -0700
committerAdnan Begovic <adnan@cyngn.com>2015-06-25 17:36:50 -0700
commitf8542758467e2a0ce78b08f4f22de38652b38622 (patch)
tree3cd2b1bb133dd6f62f24053974e5b3c2582363ba
parent8fa506205ec1fdeabd965d3622a825ddfe30794c (diff)
downloadandroid_packages_apps_Profiles-f8542758467e2a0ce78b08f4f22de38652b38622.tar.gz
android_packages_apps_Profiles-f8542758467e2a0ce78b08f4f22de38652b38622.tar.bz2
android_packages_apps_Profiles-f8542758467e2a0ce78b08f4f22de38652b38622.zip
Profiles: Refactor to point at Profiles in CMSDK.
Change-Id: I8a819c80eaf3a8880893240fb26d3242781b9486
-rw-r--r--Android.mk3
-rw-r--r--src/org/cyanogenmod/profiles/ProfilesTrustAgent.java7
2 files changed, 7 insertions, 3 deletions
diff --git a/Android.mk b/Android.mk
index b9ccf46..ade902b 100644
--- a/Android.mk
+++ b/Android.mk
@@ -19,6 +19,9 @@ include $(CLEAR_VARS)
LOCAL_SRC_FILES := $(call all-java-files-under, src)
+LOCAL_STATIC_JAVA_LIBRARIES := \
+ org.cyanogenmod.platform.sdk
+
LOCAL_MODULE_TAGS := optional
LOCAL_CERTIFICATE := platform
diff --git a/src/org/cyanogenmod/profiles/ProfilesTrustAgent.java b/src/org/cyanogenmod/profiles/ProfilesTrustAgent.java
index 41c50ae..ce25d26 100644
--- a/src/org/cyanogenmod/profiles/ProfilesTrustAgent.java
+++ b/src/org/cyanogenmod/profiles/ProfilesTrustAgent.java
@@ -16,8 +16,6 @@
package org.cyanogenmod.profiles;
-import android.app.Profile;
-import android.app.ProfileManager;
import android.content.BroadcastReceiver;
import android.content.Context;
import android.content.Intent;
@@ -27,6 +25,9 @@ import android.os.Message;
import android.service.trust.TrustAgentService;
import android.util.Log;
+import cyanogenmod.app.Profile;
+import cyanogenmod.app.ProfileManager;
+
import java.lang.ref.WeakReference;
/**
@@ -57,7 +58,7 @@ public class ProfilesTrustAgent extends TrustAgentService {
@Override
public void onCreate() {
super.onCreate();
- mProfileManager = (ProfileManager) getSystemService(Context.PROFILE_SERVICE);
+ mProfileManager = ProfileManager.getInstance(this);
mHandler = new ProfileHandler(ProfilesTrustAgent.this);
IntentFilter filter = new IntentFilter();