Merge "Profiles - Part 2 of 2" into ics (b16ffd1b) · Commits · e / os / android_frameworks_base

Android.mk

+3 −0

Original line number	Diff line number	Diff line
		@@ -72,6 +72,7 @@ LOCAL_SRC_FILES += \
		core/java/android/app/IBackupAgent.aidl \
		core/java/android/app/IInstrumentationWatcher.aidl \
		core/java/android/app/INotificationManager.aidl \
		core/java/android/app/IProfileManager.aidl \
		core/java/android/app/IProcessObserver.aidl \
		core/java/android/app/ISearchManager.aidl \
		core/java/android/app/ISearchManagerCallback.aidl \
		@@ -250,6 +251,8 @@ aidl_files := \
		frameworks/base/core/java/android/accounts/IAccountAuthenticator.aidl \
		frameworks/base/core/java/android/accounts/IAccountAuthenticatorResponse.aidl \
		frameworks/base/core/java/android/app/Notification.aidl \
		frameworks/base/core/java/android/app/NotificationGroup.aidl \
		frameworks/base/core/java/android/app/Profile.aidl \
		frameworks/base/core/java/android/app/PendingIntent.aidl \
		frameworks/base/core/java/android/bluetooth/BluetoothDevice.aidl \
		frameworks/base/core/java/android/bluetooth/BluetoothHealthAppConfiguration.aidl \

core/java/android/app/ConnectionSettings.java

0 → 100755

+207 −0

Original line number	Diff line number	Diff line
		package android.app;

		import android.bluetooth.BluetoothAdapter;
		import android.content.Context;
		import android.location.LocationManager;
		import android.net.wifi.WifiManager;
		import android.os.Parcel;
		import android.os.Parcelable;
		import android.provider.Settings;

		import org.xmlpull.v1.XmlPullParser;
		import org.xmlpull.v1.XmlPullParserException;

		import java.io.IOException;

		/** @hide */
		public final class ConnectionSettings implements Parcelable {

		private int mConnectionId;
		private int mValue;
		private boolean mOverride;
		private boolean mDirty;

		public static final int PROFILE_CONNECTION_WIFI = 1;
		public static final int PROFILE_CONNECTION_WIFIAP = 2;
		public static final int PROFILE_CONNECTION_WIMAX = 3;
		public static final int PROFILE_CONNECTION_GPS = 4;
		public static final int PROFILE_CONNECTION_BLUETOOTH = 7;

		/** @hide */
		public static final Parcelable.Creator<ConnectionSettings> CREATOR = new Parcelable.Creator<ConnectionSettings>() {
		public ConnectionSettings createFromParcel(Parcel in) {
		return new ConnectionSettings(in);
		}

		@Override
		public ConnectionSettings[] newArray(int size) {
		return new ConnectionSettings[size];
		}
		};


		public ConnectionSettings(Parcel parcel) {
		readFromParcel(parcel);
		}

		public ConnectionSettings(int connectionId) {
		this(connectionId, 0, false);
		}

		public ConnectionSettings(int connectionId, int value, boolean override) {
		mConnectionId = connectionId;
		mValue = value;
		mOverride = override;
		mDirty = false;
		}

		public int getConnectionId() {
		return mConnectionId;
		}

		public int getValue() {
		return mValue;
		}

		public void setValue(int value) {
		mValue = value;
		mDirty = true;
		}

		public void setOverride(boolean override) {
		mOverride = override;
		mDirty = true;
		}

		public boolean isOverride() {
		return mOverride;
		}

		/** @hide */
		public boolean isDirty() {
		return mDirty;
		}

		public void processOverride(Context context) {
		BluetoothAdapter bta = BluetoothAdapter.getDefaultAdapter();
		LocationManager lm = (LocationManager) context.getSystemService(Context.LOCATION_SERVICE);
		WifiManager wm = (WifiManager) context.getSystemService(Context.WIFI_SERVICE);
		Boolean state;

		switch (getConnectionId()) {
		case PROFILE_CONNECTION_BLUETOOTH:
		state = bta.isEnabled();
		if (getValue() == 1) {
		if (!state) {
		bta.enable();
		}
		} else {
		if (state) {
		bta.disable();
		}
		}
		break;
		case PROFILE_CONNECTION_GPS:
		state = lm.isProviderEnabled(LocationManager.GPS_PROVIDER);
		if (getValue() == 1) {
		if (!state) {
		Settings.Secure.setLocationProviderEnabled(context.getContentResolver(), LocationManager.GPS_PROVIDER, true);
		}
		} else {
		if (state) {
		Settings.Secure.setLocationProviderEnabled(context.getContentResolver(), LocationManager.GPS_PROVIDER, false);
		}
		}
		break;
		case PROFILE_CONNECTION_WIFI:
		int wifiApState = wm.getWifiApState();
		state = wm.isWifiEnabled();
		if (getValue() == 1) {
		if ((wifiApState == WifiManager.WIFI_AP_STATE_ENABLING) \|\| (wifiApState == WifiManager.WIFI_AP_STATE_ENABLED)) {
		wm.setWifiApEnabled(null, false);
		}
		if (!state) {
		wm.setWifiEnabled(true);
		}
		} else {
		if (state) {
		wm.setWifiEnabled(false);
		}
		}
		break;
		case PROFILE_CONNECTION_WIFIAP:
		int wifiState = wm.getWifiState();
		state = wm.isWifiApEnabled();
		if (getValue() == 1) {
		if ((wifiState == WifiManager.WIFI_STATE_ENABLING) \|\| (wifiState == WifiManager.WIFI_STATE_ENABLED)) {
		wm.setWifiEnabled(false);
		}
		if (!state) {
		wm.setWifiApEnabled(null, true);
		}
		} else {
		if (state) {
		wm.setWifiApEnabled(null, false);
		}
		}
		break;
		default: break;
		}
		}

		/** @hide */
		public static ConnectionSettings fromXml(XmlPullParser xpp, Context context)
		throws XmlPullParserException, IOException {
		int event = xpp.next();
		ConnectionSettings connectionDescriptor = new ConnectionSettings(0);
		while (event != XmlPullParser.END_TAG \|\| !xpp.getName().equals("connectionDescriptor")) {
		if (event == XmlPullParser.START_TAG) {
		String name = xpp.getName();
		if (name.equals("connectionId")) {
		connectionDescriptor.mConnectionId = Integer.parseInt(xpp.nextText());
		} else if (name.equals("value")) {
		connectionDescriptor.mValue = Integer.parseInt(xpp.nextText());
		} else if (name.equals("override")) {
		connectionDescriptor.mOverride = Boolean.parseBoolean(xpp.nextText());
		}
		}
		event = xpp.next();
		}
		return connectionDescriptor;
		}

		/** @hide */
		public void getXmlString(StringBuilder builder, Context context) {
		builder.append("<connectionDescriptor>\n<connectionId>");
		builder.append(mConnectionId);
		builder.append("</connectionId>\n<value>");
		builder.append(mValue);
		builder.append("</value>\n<override>");
		builder.append(mOverride);
		builder.append("</override>\n</connectionDescriptor>\n");
		}

		@Override
		public int describeContents() {
		return 0;
		}

		/** @hide */
		@Override
		public void writeToParcel(Parcel dest, int flags) {
		dest.writeInt(mConnectionId);
		dest.writeInt(mOverride ? 1 : 0);
		dest.writeInt(mValue);
		dest.writeInt(mDirty ? 1 : 0);
		}

		/** @hide */
		public void readFromParcel(Parcel in) {
		mConnectionId = in.readInt();
		mOverride = in.readInt() != 0;
		mValue = in.readInt();
		mDirty = in.readInt() != 0;
		}


		}

core/java/android/app/ContextImpl.java

+6 −0

Original line number	Diff line number	Diff line
		@@ -459,6 +459,12 @@ class ContextImpl extends Context {
		public Object createService(ContextImpl ctx) {
		return WimaxHelper.createWimaxService(ctx, ctx.mMainThread.getHandler());
		}});

		registerService(PROFILE_SERVICE, new ServiceFetcher() {
		public Object createService(ContextImpl ctx) {
		final Context outerContext = ctx.getOuterContext();
		return new ProfileManager (outerContext, ctx.mMainThread.getHandler());
		}});
		}

		static ContextImpl getImpl(Context context) {

core/java/android/app/IProfileManager.aidl

0 → 100644

+49 −0

Original line number	Diff line number	Diff line
		/* //device/java/android/android/app/IProfileManager.aidl
		**
		** Copyright 2007, The Android Open Source Project
		**
		** Licensed under the Apache License, Version 2.0 (the "License");
		** you may not use this file except in compliance with the License.
		** You may obtain a copy of the License at
		**
		** http://www.apache.org/licenses/LICENSE-2.0
		**
		** Unless required by applicable law or agreed to in writing, software
		** distributed under the License is distributed on an "AS IS" BASIS,
		** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		** See the License for the specific language governing permissions and
		** limitations under the License.
		*/

		package android.app;

		import android.app.Profile;
		import android.app.NotificationGroup;
		import android.os.ParcelUuid;

		/** {@hide} */
		interface IProfileManager
		{
		boolean setActiveProfile(in ParcelUuid profileParcelUuid);
		boolean setActiveProfileByName(String profileName);
		Profile getActiveProfile();

		boolean addProfile(in Profile profile);
		boolean removeProfile(in Profile profile);
		void updateProfile(in Profile profile);

		Profile getProfile(in ParcelUuid profileParcelUuid);
		Profile getProfileByName(String profileName);
		Profile[] getProfiles();
		boolean profileExists(in ParcelUuid profileUuid);
		boolean profileExistsByName(String profileName);

		NotificationGroup[] getNotificationGroups();
		void addNotificationGroup(in NotificationGroup group);
		void removeNotificationGroup(in NotificationGroup group);
		void updateNotificationGroup(in NotificationGroup group);
		NotificationGroup getNotificationGroupForPackage(in String pkg);
		NotificationGroup getNotificationGroup(in ParcelUuid groupParcelUuid);

		void resetAll();
		}

core/java/android/app/NotificationGroup.aidl

0 → 100644

+19 −0

Original line number	Diff line number	Diff line
		/**
		* Copyright (c) 2012, The CyanogenMod Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		package android.app;

		parcelable NotificationGroup;