* @throws IllegalArgumentException if the userId is invalid.
*/
@SystemApi
- public String getProfileOwnerNameAsUser(UserHandle user) throws IllegalArgumentException {
+ public String getProfileOwnerNameAsUser(int userId) throws IllegalArgumentException {
if (mService != null) {
try {
- return mService.getProfileOwnerName(user.getIdentifier());
+ return mService.getProfileOwnerName(userId);
} catch (RemoteException re) {
Log.w(TAG, "Failed to get profile owner");
throw new IllegalArgumentException(
<!-- Footer device owned text [CHAR LIMIT=50] -->
<string name="device_owned_footer">Device may be monitored</string>
+ <!-- Footer profile owned text [CHAR LIMIT=50] -->
+ <string name="profile_owned_footer">Profile may be monitored</string>
+
<!-- Footer vpn present text [CHAR LIMIT=50] -->
<string name="vpn_footer">Network may be monitored</string>
<!-- Monitoring dialog title for device owned devices [CHAR LIMIT=35] -->
<string name="monitoring_title_device_owned">Device monitoring</string>
+ <!-- Monitoring dialog title for profile owned devices [CHAR LIMIT=35] -->
+ <string name="monitoring_title_profile_owned">Profile monitoring</string>
+
<!-- Monitoring dialog title for normal devices [CHAR LIMIT=35]-->
<string name="monitoring_title">Network monitoring</string>
<!-- Monitoring dialog legacy VPN with device owner text [CHAR LIMIT=300] -->
<string name="monitoring_description_legacy_vpn_device_owned">This device is managed by:\n<xliff:g id="organization">%1$s</xliff:g>\n\nYour administrator is capable of monitoring your network activity including emails, apps, and secure websites. For more information, contact your administrator.\n\nAlso, you\'re connected to a VPN (\"<xliff:g id="application">%2$s</xliff:g>\"). Your VPN service provider can monitor network activity too.</string>
+ <!-- Monitoring dialog profile owner body text [CHAR LIMIT=300] -->
+ <string name="monitoring_description_profile_owned">This profile is managed by:\n<xliff:g id="organization">%1$s</xliff:g>\n\nYour administrator can monitor your device and network activity, including emails, apps and secure websites.\n\nFor more information, contact your administrator.</string>
+
+ <!-- Monitoring dialog device and profile owner body text [CHAR LIMIT=300] -->
+ <string name="monitoring_description_device_and_profile_owned">This device is managed by:\n<xliff:g id="organization">%1$s</xliff:g>\nYour profile is managed by:\n<xliff:g id="organization">%2$s</xliff:g>\n\nYour administrator can monitor your device and network activity, including emails, apps and secure websites.\n\nFor more information, contact your administrator.</string>
+
+ <!-- Monitoring dialog non-legacy VPN with profile owner text [CHAR LIMIT=300] -->
+ <string name="monitoring_description_vpn_profile_owned">This profile is managed by:\n<xliff:g id="organization">%1$s</xliff:g>\n\nYour administrator is capable of monitoring your network activity including emails, apps, and secure websites. For more information, contact your administrator.\n\nAlso, you gave \"<xliff:g id="application">%2$s</xliff:g>\" permission to set up a VPN connection. This app can monitor network activity too.</string>
+
+ <!-- Monitoring dialog legacy VPN with profile owner text [CHAR LIMIT=300] -->
+ <string name="monitoring_description_legacy_vpn_profile_owned">This profile is managed by:\n<xliff:g id="organization">%1$s</xliff:g>\n\nYour administrator is capable of monitoring your network activity including emails, apps, and secure websites. For more information, contact your administrator.\n\nAlso, you\'re connected to a VPN (\"<xliff:g id="application">%2$s</xliff:g>\"). Your VPN service provider can monitor network activity too.</string>
+
+ <!-- Monitoring dialog non-legacy VPN with device and profile owner text [CHAR LIMIT=300] -->
+ <string name="monitoring_description_vpn_device_and_profile_owned">This device is managed by:\n<xliff:g id="organization">%1$s</xliff:g>\nYour profile is managed by:\n<xliff:g id="organization">%2$s</xliff:g>\n\nYour administrator is capable of monitoring your network activity including emails, apps, and secure websites. For more information, contact your administrator.\n\nAlso, you gave \"<xliff:g id="application">%3$s</xliff:g>\" permission to set up a VPN connection. This app can monitor network activity too.</string>
+
+ <!-- Monitoring dialog legacy VPN with device and profile owner text [CHAR LIMIT=300] -->
+ <string name="monitoring_description_legacy_vpn_device_and_profile_owned">This device is managed by:\n<xliff:g id="organization">%1$s</xliff:g>\nYour profile is managed by:\n<xliff:g id="organization">%2$s</xliff:g>\n\nYour administrator is capable of monitoring your network activity including emails, apps, and secure websites. For more information, contact your administrator.\n\nAlso, you\'re connected to a VPN (\"<xliff:g id="application">%3$s</xliff:g>\"). Your VPN service provider can monitor network activity too.</string>
+
<!-- Indication on the keyguard that appears when the user disables trust agents until the next time they unlock manually. [CHAR LIMIT=NONE] -->
<string name="keyguard_indication_trust_disabled">Device will stay locked until you manually unlock</string>
import android.os.Message;
import android.util.Log;
import android.util.TypedValue;
-import android.view.ContextThemeWrapper;
import android.view.LayoutInflater;
import android.view.View;
import android.view.View.OnClickListener;
-import android.view.WindowManager;
import android.widget.ImageView;
import android.widget.TextView;
import com.android.systemui.statusbar.phone.QSTileHost;
import com.android.systemui.statusbar.phone.SystemUIDialog;
import com.android.systemui.statusbar.policy.SecurityController;
-import com.android.systemui.statusbar.policy.SecurityController.VpnCallback;
public class QSFooter implements OnClickListener, DialogInterface.OnClickListener {
protected static final String TAG = "QSFooter";
private AlertDialog mDialog;
private QSTileHost mHost;
private Handler mHandler;
+ private final Handler mMainHandler;
private boolean mIsVisible;
private boolean mIsIconVisible;
mFooterText = (TextView) mRootView.findViewById(R.id.footer_text);
mFooterIcon = (ImageView) mRootView.findViewById(R.id.footer_icon);
mContext = context;
+ mMainHandler = new Handler();
}
public void setHost(QSTileHost host) {
mFooterTextId = R.string.device_owned_footer;
mIsVisible = true;
mIsIconVisible = false;
+ } else if (mSecurityController.hasProfileOwner()) {
+ mFooterTextId = R.string.profile_owned_footer;
+ mIsVisible = true;
+ mIsIconVisible = false;
} else if (mSecurityController.isVpnEnabled()) {
mFooterTextId = R.string.vpn_footer;
mIsVisible = true;
mIsIconVisible = true;
} else {
mIsVisible = false;
+ mIsIconVisible = false;
}
- mRootView.post(mUpdateDisplayState);
+ mMainHandler.post(mUpdateDisplayState);
}
@Override
private String getMessage() {
if (mSecurityController.hasDeviceOwner()) {
+ if (mSecurityController.hasProfileOwner()) {
+ if (mSecurityController.isVpnEnabled()) {
+ if (mSecurityController.isLegacyVpn()) {
+ return mContext.getString(
+ R.string.monitoring_description_legacy_vpn_device_and_profile_owned,
+ mSecurityController.getDeviceOwnerName(),
+ mSecurityController.getProfileOwnerName(),
+ mSecurityController.getLegacyVpnName());
+ } else {
+ return mContext.getString(
+ R.string.monitoring_description_vpn_device_and_profile_owned,
+ mSecurityController.getDeviceOwnerName(),
+ mSecurityController.getProfileOwnerName(),
+ mSecurityController.getVpnApp());
+ }
+ } else {
+ return mContext.getString(
+ R.string.monitoring_description_device_and_profile_owned,
+ mSecurityController.getDeviceOwnerName(),
+ mSecurityController.getProfileOwnerName());
+ }
+ } else {
+ if (mSecurityController.isVpnEnabled()) {
+ if (mSecurityController.isLegacyVpn()) {
+ return mContext.getString(
+ R.string.monitoring_description_legacy_vpn_device_owned,
+ mSecurityController.getDeviceOwnerName(),
+ mSecurityController.getLegacyVpnName());
+ } else {
+ return mContext.getString(R.string.monitoring_description_vpn_device_owned,
+ mSecurityController.getDeviceOwnerName(),
+ mSecurityController.getVpnApp());
+ }
+ } else {
+ return mContext.getString(R.string.monitoring_description_device_owned,
+ mSecurityController.getDeviceOwnerName());
+ }
+ }
+ } else if (mSecurityController.hasProfileOwner()) {
if (mSecurityController.isVpnEnabled()) {
if (mSecurityController.isLegacyVpn()) {
return mContext.getString(
- R.string.monitoring_description_legacy_vpn_device_owned,
- mSecurityController.getDeviceOwnerName(),
+ R.string.monitoring_description_legacy_vpn_profile_owned,
+ mSecurityController.getProfileOwnerName(),
mSecurityController.getLegacyVpnName());
} else {
- return mContext.getString(R.string.monitoring_description_vpn_device_owned,
- mSecurityController.getDeviceOwnerName(),
+ return mContext.getString(
+ R.string.monitoring_description_vpn_profile_owned,
+ mSecurityController.getProfileOwnerName(),
mSecurityController.getVpnApp());
}
} else {
- return mContext.getString(R.string.monitoring_description_device_owned,
- mSecurityController.getDeviceOwnerName());
+ return mContext.getString(
+ R.string.monitoring_description_profile_owned,
+ mSecurityController.getProfileOwnerName());
}
} else {
if (mSecurityController.isLegacyVpn()) {
if (mSecurityController.hasDeviceOwner()) {
return R.string.monitoring_title_device_owned;
}
+ if (mSecurityController.hasProfileOwner()) {
+ return R.string.monitoring_title_profile_owned;
+ }
return R.string.monitoring_title;
}
}
};
- private class Callback implements VpnCallback {
+ private class Callback implements SecurityController.SecurityControllerCallback {
@Override
- public void onVpnStateChanged() {
+ public void onStateChanged() {
refreshState();
}
}
for (QSTile<?> tile : mTiles.values()) {
tile.userSwitch(newUserId);
}
+ mSecurity.onUserSwitched(newUserId);
mObserver.register();
}
};
public interface SecurityController {
boolean hasDeviceOwner();
+ boolean hasProfileOwner();
String getDeviceOwnerName();
+ String getProfileOwnerName();
boolean isVpnEnabled();
String getVpnApp();
boolean isLegacyVpn();
String getLegacyVpnName();
void disconnectFromVpn();
+ void onUserSwitched(int newUserId);
- void addCallback(VpnCallback callback);
- void removeCallback(VpnCallback callback);
+ void addCallback(SecurityControllerCallback callback);
+ void removeCallback(SecurityControllerCallback callback);
- public interface VpnCallback {
- void onVpnStateChanged();
+ public interface SecurityControllerCallback {
+ void onStateChanged();
}
}
*/
package com.android.systemui.statusbar.policy;
+import android.app.ActivityManager;
import android.app.admin.DevicePolicyManager;
import android.content.Context;
import android.content.pm.PackageManager.NameNotFoundException;
private final IConnectivityManager mConnectivityService = IConnectivityManager.Stub.asInterface(
ServiceManager.getService(Context.CONNECTIVITY_SERVICE));
private final DevicePolicyManager mDevicePolicyManager;
- private final ArrayList<VpnCallback> mCallbacks = new ArrayList<VpnCallback>();
+ private final ArrayList<SecurityControllerCallback> mCallbacks
+ = new ArrayList<SecurityControllerCallback>();
private VpnConfig mVpnConfig;
private String mVpnName;
private int mCurrentVpnNetworkId = NO_NETWORK;
+ private int mCurrentUserId;
public SecurityControllerImpl(Context context) {
mContext = context;
// TODO: re-register network callback on user change.
mConnectivityManager.registerNetworkCallback(REQUEST, mNetworkCallback);
+ mCurrentUserId = ActivityManager.getCurrentUser();
}
public void dump(FileDescriptor fd, PrintWriter pw, String[] args) {
}
@Override
+ public boolean hasProfileOwner() {
+ return !TextUtils.isEmpty(mDevicePolicyManager.getProfileOwnerNameAsUser(mCurrentUserId));
+ }
+
+ @Override
public String getDeviceOwnerName() {
return mDevicePolicyManager.getDeviceOwnerName();
}
@Override
+ public String getProfileOwnerName() {
+ return mDevicePolicyManager.getProfileOwnerNameAsUser(mCurrentUserId);
+ }
+
+
+ @Override
public boolean isVpnEnabled() {
return mCurrentVpnNetworkId != NO_NETWORK;
}
}
@Override
- public void addCallback(VpnCallback callback) {
+ public void addCallback(SecurityControllerCallback callback) {
if (callback == null) return;
if (DEBUG) Log.d(TAG, "removeCallback " + callback);
mCallbacks.remove(callback);
}
@Override
- public void removeCallback(VpnCallback callback) {
+ public void removeCallback(SecurityControllerCallback callback) {
if (callback == null || mCallbacks.contains(callback)) return;
if (DEBUG) Log.d(TAG, "addCallback " + callback);
mCallbacks.add(callback);
}
+ @Override
+ public void onUserSwitched(int newUserId) {
+ mCurrentUserId = newUserId;
+ fireCallbacks();
+ }
+
private void setCurrentNetid(int netId) {
if (netId != mCurrentVpnNetworkId) {
mCurrentVpnNetworkId = netId;
}
private void fireCallbacks() {
- for (VpnCallback callback : mCallbacks) {
- callback.onVpnStateChanged();
+ for (SecurityControllerCallback callback : mCallbacks) {
+ callback.onStateChanged();
}
}
OSDN Git Service
