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

Commit b10e33ff authored by Jorim Jaggi's avatar Jorim Jaggi
Browse files

Split up android.policy into framework.jar and services.jar 1/3 

Change-Id: Ifd69f1f3dd308a7e17a1442e2f3950da8b03cec4
parent 85bd63f4

CleanSpec.mk

+1 −0
Original line number Diff line number Diff line
@@ -227,6 +227,7 @@ $(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/framew 
$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/framework_intermediates/src/core/java/com/android/internal/widget/ILockSettingsObserver.java)

$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/APPS/SystemUI_intermediates/)

$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/Keyguard_intermediates/)

$(call add-clean-step, rm -f $(OUT_DIR)/target/product/*/system/framework/android.policy.jar)



# ******************************************************************

# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST ABOVE THIS BANNER

core/java/android/app/Activity.java

+2 −2
Original line number Diff line number Diff line
@@ -27,7 +27,6 @@ import android.widget.Toolbar; 
import com.android.internal.app.IVoiceInteractor;

import com.android.internal.app.WindowDecorActionBar;

import com.android.internal.app.ToolbarActionBar;

import com.android.internal.policy.PolicyManager;



import android.annotation.IntDef;

import android.annotation.Nullable;
@@ -84,6 +83,7 @@ import android.view.Menu; 
import android.view.MenuInflater;

import android.view.MenuItem;

import android.view.MotionEvent;

import android.view.PhoneWindow;

import android.view.View;

import android.view.View.OnCreateContextMenuListener;

import android.view.ViewGroup;
@@ -5929,7 +5929,7 @@ public class Activity extends ContextThemeWrapper 


        mFragments.attachActivity(this, mContainer, null);



        mWindow = PolicyManager.makeNewWindow(this);

        mWindow = new PhoneWindow(this);

        mWindow.setCallback(this);

        mWindow.setOnWindowDismissedCallback(this);

        mWindow.getLayoutInflater().setPrivateFactory(this);

core/java/android/app/ContextImpl.java

+2 −2
Original line number Diff line number Diff line
@@ -24,7 +24,6 @@ import android.service.persistentdata.IPersistentDataBlockService; 
import android.service.persistentdata.PersistentDataBlockManager;



import com.android.internal.appwidget.IAppWidgetService;

import com.android.internal.policy.PolicyManager;

import com.android.internal.util.Preconditions;



import android.bluetooth.BluetoothManager;
@@ -139,6 +138,7 @@ import android.util.Slog; 
import android.view.DisplayAdjustments;

import android.view.ContextThemeWrapper;

import android.view.Display;

import android.view.PhoneLayoutInflater;

import android.view.WindowManagerImpl;

import android.view.accessibility.AccessibilityManager;

import android.view.accessibility.CaptioningManager;
@@ -480,7 +480,7 @@ class ContextImpl extends Context { 


        registerService(LAYOUT_INFLATER_SERVICE, new ServiceFetcher() {

                public Object createService(ContextImpl ctx) {

                    return PolicyManager.makeNewLayoutInflater(ctx.getOuterContext());

                    return new PhoneLayoutInflater(ctx.getOuterContext());

                }});



        registerService(LOCATION_SERVICE, new ServiceFetcher() {

core/java/android/app/Dialog.java

+8 −8
Original line number Diff line number Diff line
@@ -16,14 +16,13 @@ 


package android.app;



import android.content.pm.ApplicationInfo;

import com.android.internal.app.WindowDecorActionBar;

import com.android.internal.policy.PolicyManager;



import android.content.ComponentName;

import android.content.Context;

import android.content.ContextWrapper;

import android.content.DialogInterface;

import android.content.pm.ApplicationInfo;

import android.graphics.drawable.Drawable;

import android.net.Uri;

import android.os.Bundle;
@@ -42,6 +41,7 @@ import android.view.LayoutInflater; 
import android.view.Menu;

import android.view.MenuItem;

import android.view.MotionEvent;

import android.view.PhoneWindow;

import android.view.View;

import android.view.View.OnCreateContextMenuListener;

import android.view.ViewGroup;
@@ -162,7 +162,7 @@ public class Dialog implements DialogInterface, Window.Callback, 
        }



        mWindowManager = (WindowManager)context.getSystemService(Context.WINDOW_SERVICE);

        Window w = PolicyManager.makeNewWindow(mContext);

        Window w = new PhoneWindow(mContext);

        mWindow = w;

        w.setCallback(this);

        w.setOnWindowDismissedCallback(this);

core/java/android/provider/Settings.java

+2 −2
Original line number Diff line number Diff line
@@ -2473,7 +2473,7 @@ public final class Settings { 


        /**

         * Log raw orientation data from

         * {@link com.android.internal.policy.impl.WindowOrientationListener} for use with the

         * {@link com.android.server.policy.WindowOrientationListener} for use with the

         * orientationplot.py tool.

         * 0 = no

         * 1 = yes
@@ -6545,7 +6545,7 @@ public final class Settings { 
        /**

         * Defines global runtime overrides to window policy.

         *

         * See {@link com.android.internal.policy.impl.PolicyControl} for value format.

         * See {@link com.android.server.policy.PolicyControl} for value format.

         *

         * @hide

         */