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

Commit cb03504d authored by Christine Franks's avatar Christine Franks Committed by android-build-merger
Browse files

Merge "DO NOT MERGE - Remove RetailDemoModeServiceInternal" into oc-dr1-dev 

am: 4ac942f1

Change-Id: I3d09e6fe436ae1ced8f9ed88e919f1d9bb5e52db
parents 43a7e94d 4ac942f1

compiled-classes-phone

+0 −1
Original line number Diff line number Diff line
@@ -441,7 +441,6 @@ android.app.ResourcesManager$1 
android.app.ResourcesManager$ActivityResources

android.app.ResultInfo

android.app.ResultInfo$1

android.app.RetailDemoModeServiceInternal

android.app.SearchableInfo

android.app.SearchableInfo$1

android.app.Service

core/java/android/app/RetailDemoModeServiceInternal.java

deleted100644 → 0
+0 −29
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2016 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;



/**

 * Retail Demo Mode Service interface to be used locally inside system server

 *

 * @hide Only for use inside system server

 */

public interface RetailDemoModeServiceInternal {

    /**

     * Used to notify RetailDemoModeService of any user activity.

     */

    public void onUserActivity();

}
 
 No newline at end of file

services/core/java/com/android/server/power/Notifier.java

+0 −6
Original line number Diff line number Diff line
@@ -18,7 +18,6 @@ package com.android.server.power; 


import android.app.ActivityManagerInternal;

import android.app.AppOpsManager;

import android.app.RetailDemoModeServiceInternal;



import com.android.internal.app.IAppOpsService;

import com.android.internal.app.IBatteryStats;
@@ -94,7 +93,6 @@ final class Notifier { 
    private final ActivityManagerInternal mActivityManagerInternal;

    private final InputManagerInternal mInputManagerInternal;

    private final InputMethodManagerInternal mInputMethodManagerInternal;

    private final RetailDemoModeServiceInternal mRetailDemoModeServiceInternal;



    private final NotifierHandler mHandler;

    private final Intent mScreenOnIntent;
@@ -140,7 +138,6 @@ final class Notifier { 
        mActivityManagerInternal = LocalServices.getService(ActivityManagerInternal.class);

        mInputManagerInternal = LocalServices.getService(InputManagerInternal.class);

        mInputMethodManagerInternal = LocalServices.getService(InputMethodManagerInternal.class);

        mRetailDemoModeServiceInternal = LocalServices.getService(RetailDemoModeServiceInternal.class);



        mHandler = new NotifierHandler(looper);

        mScreenOnIntent = new Intent(Intent.ACTION_SCREEN_ON);
@@ -587,9 +584,6 @@ final class Notifier { 
            }

            mUserActivityPending = false;

        }

        if (mRetailDemoModeServiceInternal != null) {

            mRetailDemoModeServiceInternal.onUserActivity();

        }

        mPolicy.userActivity();

    }

services/profile-classes

+0 −1
Original line number Diff line number Diff line
@@ -277,7 +277,6 @@ Landroid/app/ResourcesManager; 
Landroid/app/ResourcesManager$1;

Landroid/app/ResultInfo;

Landroid/app/ResultInfo$1;

Landroid/app/RetailDemoModeServiceInternal;

Landroid/app/SearchableInfo;

Landroid/app/SearchableInfo$1;

Landroid/app/SearchManager;