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

Merge "Fix up the tests."

Browse Source
This commit is contained in:
TreeHugger Robot
2017-01-19 21:52:32 +00:00
committed by Android (Google) Code Review
parent f54bbe0868 21380738ea
commit b6ea3988a0
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
View File

@@ -74,6 +74,7 @@ import android.os.Bundle;
import android.os.Handler;
import android.os.HandlerThread;
import android.os.IBinder;
import android.os.Looper;
import android.os.Message;
import android.os.PowerManager;
import android.os.Process;
@@ -126,6 +127,7 @@ import com.android.systemui.EventLogTags;
import com.android.systemui.Interpolators;
import com.android.systemui.Prefs;
import com.android.systemui.R;
import com.android.systemui.SysUiServiceProvider;
import com.android.systemui.SystemUIApplication;
import com.android.systemui.SystemUIFactory;
import com.android.systemui.classifier.FalsingLog;
@@ -1029,8 +1031,10 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode,
}
public static Handler getTimeTickHandler(Context context) {
return ((SystemUIApplication) context.getApplicationContext())
.getComponent(PhoneStatusBar.class).getTimeTickHandler();
PhoneStatusBar statusBar = ((SysUiServiceProvider) context.getApplicationContext())
.getComponent(PhoneStatusBar.class);
return statusBar != null ? statusBar.getTimeTickHandler() :
new Handler(Looper.getMainLooper());
}
protected void createNavigationBar() {

1
packages/SystemUI/tests/AndroidManifest.xml
View File

@@ -29,6 +29,7 @@
<uses-permission android:name="android.permission.BIND_QUICK_SETTINGS_TILE" />
<uses-permission android:name="android.permission.ACCESS_KEYGUARD_SECURE_STORAGE" />
<uses-permission android:name="android.permission.STATUS_BAR_SERVICE" />
<uses-permission android:name="android.permission.ACCESS_VR_MANAGER" />
<application>
<uses-library android:name="android.test.runner" />