Loading telecomm/java/android/telecom/PhoneAccountHandle.java +21 −5 Original line number Original line Diff line number Diff line Loading @@ -16,6 +16,7 @@ package android.telecom; package android.telecom; import android.annotation.NonNull; import android.content.ComponentName; import android.content.ComponentName; import android.os.Parcel; import android.os.Parcel; import android.os.Parcelable; import android.os.Parcelable; Loading @@ -33,6 +34,9 @@ import java.util.Objects; * component name.</li> * component name.</li> * </ul> * </ul> * * * Note: This Class requires a non-null {@link ComponentName} and {@link UserHandle} to operate * properly. Passing in invalid parameters will generate a log warning. * * See {@link PhoneAccount}, {@link TelecomManager}. * See {@link PhoneAccount}, {@link TelecomManager}. */ */ public final class PhoneAccountHandle implements Parcelable { public final class PhoneAccountHandle implements Parcelable { Loading @@ -41,15 +45,16 @@ public final class PhoneAccountHandle implements Parcelable { private final UserHandle mUserHandle; private final UserHandle mUserHandle; public PhoneAccountHandle( public PhoneAccountHandle( ComponentName componentName, @NonNull ComponentName componentName, String id) { @NonNull String id) { this(componentName, id, Process.myUserHandle()); this(componentName, id, Process.myUserHandle()); } } public PhoneAccountHandle( public PhoneAccountHandle( ComponentName componentName, @NonNull ComponentName componentName, String id, @NonNull String id, UserHandle userHandle) { @NonNull UserHandle userHandle) { checkParameters(componentName, userHandle); mComponentName = componentName; mComponentName = componentName; mId = id; mId = id; mUserHandle = userHandle; mUserHandle = userHandle; Loading Loading @@ -136,6 +141,17 @@ public final class PhoneAccountHandle implements Parcelable { mUserHandle.writeToParcel(out, flags); mUserHandle.writeToParcel(out, flags); } } private void checkParameters(ComponentName componentName, UserHandle userHandle) { if(componentName == null) { android.util.Log.w("PhoneAccountHandle", new Exception("PhoneAccountHandle has " + "been created with null ComponentName!")); } if(userHandle == null) { android.util.Log.w("PhoneAccountHandle", new Exception("PhoneAccountHandle has " + "been created with null UserHandle!")); } } public static final Creator<PhoneAccountHandle> CREATOR = new Creator<PhoneAccountHandle>() { public static final Creator<PhoneAccountHandle> CREATOR = new Creator<PhoneAccountHandle>() { @Override @Override public PhoneAccountHandle createFromParcel(Parcel in) { public PhoneAccountHandle createFromParcel(Parcel in) { Loading Loading
telecomm/java/android/telecom/PhoneAccountHandle.java +21 −5 Original line number Original line Diff line number Diff line Loading @@ -16,6 +16,7 @@ package android.telecom; package android.telecom; import android.annotation.NonNull; import android.content.ComponentName; import android.content.ComponentName; import android.os.Parcel; import android.os.Parcel; import android.os.Parcelable; import android.os.Parcelable; Loading @@ -33,6 +34,9 @@ import java.util.Objects; * component name.</li> * component name.</li> * </ul> * </ul> * * * Note: This Class requires a non-null {@link ComponentName} and {@link UserHandle} to operate * properly. Passing in invalid parameters will generate a log warning. * * See {@link PhoneAccount}, {@link TelecomManager}. * See {@link PhoneAccount}, {@link TelecomManager}. */ */ public final class PhoneAccountHandle implements Parcelable { public final class PhoneAccountHandle implements Parcelable { Loading @@ -41,15 +45,16 @@ public final class PhoneAccountHandle implements Parcelable { private final UserHandle mUserHandle; private final UserHandle mUserHandle; public PhoneAccountHandle( public PhoneAccountHandle( ComponentName componentName, @NonNull ComponentName componentName, String id) { @NonNull String id) { this(componentName, id, Process.myUserHandle()); this(componentName, id, Process.myUserHandle()); } } public PhoneAccountHandle( public PhoneAccountHandle( ComponentName componentName, @NonNull ComponentName componentName, String id, @NonNull String id, UserHandle userHandle) { @NonNull UserHandle userHandle) { checkParameters(componentName, userHandle); mComponentName = componentName; mComponentName = componentName; mId = id; mId = id; mUserHandle = userHandle; mUserHandle = userHandle; Loading Loading @@ -136,6 +141,17 @@ public final class PhoneAccountHandle implements Parcelable { mUserHandle.writeToParcel(out, flags); mUserHandle.writeToParcel(out, flags); } } private void checkParameters(ComponentName componentName, UserHandle userHandle) { if(componentName == null) { android.util.Log.w("PhoneAccountHandle", new Exception("PhoneAccountHandle has " + "been created with null ComponentName!")); } if(userHandle == null) { android.util.Log.w("PhoneAccountHandle", new Exception("PhoneAccountHandle has " + "been created with null UserHandle!")); } } public static final Creator<PhoneAccountHandle> CREATOR = new Creator<PhoneAccountHandle>() { public static final Creator<PhoneAccountHandle> CREATOR = new Creator<PhoneAccountHandle>() { @Override @Override public PhoneAccountHandle createFromParcel(Parcel in) { public PhoneAccountHandle createFromParcel(Parcel in) { Loading