Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am a93ed128: am 7bd8e6a8: DateTimeView: don\'t assume you have an ApplicationContext.

Browse Source 
* commit 'a93ed1288176e7f4789923f361e798bce6ef1618':
  DateTimeView: don't assume you have an ApplicationContext.
This commit is contained in:
Dan Sandler
2015-07-30 16:54:03 +00:00
committed by Android Git Automerger
parent e5d8cb37f6 a93ed12881
commit 06e544f0be
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
core/java/android/widget/DateTimeView.java
View File

@@ -25,7 +25,6 @@ import android.os.Handler;
import android.text.format.Time;
import android.util.AttributeSet;
import android.util.Log;
import android.widget.TextView;
import android.widget.RemoteViews.RemoteView;
import java.text.DateFormat;
@@ -228,14 +227,14 @@ public class DateTimeView extends TextView {
final boolean register = mAttachedViews.isEmpty();
mAttachedViews.add(v);
if (register) {
register(v.getContext().getApplicationContext());
register(getApplicationContextIfAvailable(v.getContext()));
}
}
public void removeView(DateTimeView v) {
mAttachedViews.remove(v);
if (mAttachedViews.isEmpty()) {
unregister(v.getContext().getApplicationContext());
unregister(getApplicationContextIfAvailable(v.getContext()));
}
}
@@ -258,6 +257,11 @@ public class DateTimeView extends TextView {
return result;
}
static final Context getApplicationContextIfAvailable(Context context) {
final Context ac = context.getApplicationContext();
return ac != null ? ac : context;
}
void register(Context context) {
final IntentFilter filter = new IntentFilter();
filter.addAction(Intent.ACTION_TIME_TICK);