Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 51b3c2f2 authored by Joe Onorato's avatar Joe Onorato Committed by Android Git Automerger
Browse files

am e0b2ae11: am 25f95f92: Rename IStatusBar to IStatusBarService.

parents eeb42c4e e0b2ae11

Android.mk

+1 −1
Original line number Diff line number Diff line
@@ -86,7 +86,7 @@ LOCAL_SRC_FILES += \ 
	core/java/android/app/ISearchManager.aidl \

	core/java/android/app/ISearchManagerCallback.aidl \

	core/java/android/app/IServiceConnection.aidl \

	core/java/android/app/IStatusBar.aidl \

	core/java/android/app/IStatusBarService.aidl \

	core/java/android/app/IPoo.aidl \

	core/java/android/app/IThumbnailReceiver.aidl \

	core/java/android/app/ITransientNotification.aidl \

core/java/android/app/IStatusBar.aidl→core/java/android/app/IStatusBarService.aidl

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ package android.app; 
import android.app.IPoo;



/** @hide */

interface IStatusBar

interface IStatusBarService

{

    void activate();

    void deactivate();

core/java/android/app/StatusBarManager.java

+2 −2
Original line number Diff line number Diff line
@@ -58,12 +58,12 @@ public class StatusBarManager { 
    public static final int DISABLE_NONE = 0x00000000;



    private Context mContext;

    private IStatusBar mService;

    private IStatusBarService mService;

    private IBinder mToken = new Binder();



    StatusBarManager(Context context) {

        mContext = context;

        mService = IStatusBar.Stub.asInterface(

        mService = IStatusBarService.Stub.asInterface(

                ServiceManager.getService(Context.STATUS_BAR_SERVICE));

    }

packages/StatusBarPhone/src/com/android/policy/statusbar/phone/StatusBarService.java

+3 −3
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ 
package com.android.policy.statusbar.phone;



import android.app.Service;

import android.app.IStatusBar;

import android.app.IStatusBarService;

import android.app.IPoo;

import android.content.Context;

import android.content.Intent;
@@ -38,7 +38,7 @@ public class StatusBarService extends Service { 
    private static final String TAG = "StatusBarService";



    Bar mBar = new Bar();

    IStatusBar mBarService;

    IStatusBarService mBarService;



    @Override

    public void onCreate() {
@@ -46,7 +46,7 @@ public class StatusBarService extends Service { 
        addStatusBarView();



        // Connect in to the status bar manager service

        mBarService = IStatusBar.Stub.asInterface(

        mBarService = IStatusBarService.Stub.asInterface(

                ServiceManager.getService(Context.STATUS_BAR_SERVICE));

        try {

            mBarService.registerStatusBar(mBar);

policy/com/android/internal/policy/impl/PhoneWindowManager.java

+3 −3
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ package com.android.internal.policy.impl; 
import android.app.Activity;

import android.app.ActivityManagerNative;

import android.app.IActivityManager;

import android.app.IStatusBar;

import android.app.IStatusBarService;

import android.app.IUiModeManager;

import android.app.UiModeManager;

import android.content.ActivityNotFoundException;
@@ -1145,7 +1145,7 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
                // this key doesn't exist on current hardware, but if a device

                // didn't have a touchscreen, it would want one of these to open

                // the status bar.

                IStatusBar sbs = IStatusBar.Stub.asInterface(ServiceManager.getService("statusbar"));

                IStatusBarService sbs = IStatusBarService.Stub.asInterface(ServiceManager.getService("statusbar"));

                if (sbs != null) {

                    try {

                        sbs.toggle();
@@ -1537,7 +1537,7 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
        }

        

        if (changes != 0 && hiding) {

            IStatusBar sbs = IStatusBar.Stub.asInterface(ServiceManager.getService("statusbar"));

            IStatusBarService sbs = IStatusBarService.Stub.asInterface(ServiceManager.getService("statusbar"));

            if (sbs != null) {

                try {

                    // Make sure the window shade is hidden.