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

Commit 8aeec22e authored by Dario Freni's avatar Dario Freni Committed by Android (Google) Code Review
Browse files

Merge "Implement ModuleInfoProvider"

parents d900848e 2c828c1d

core/java/android/app/ApplicationPackageManager.java

+15 −3
Original line number Diff line number Diff line
@@ -794,12 +794,25 @@ public class ApplicationPackageManager extends PackageManager { 


    @Override

    public List<ModuleInfo> getInstalledModules(int flags) {

        return null;

        try {

            return mPM.getInstalledModules(flags);

        } catch (RemoteException e) {

            throw e.rethrowFromSystemServer();

        }

    }



    @Override

    public ModuleInfo getModuleInfo(String packageName, int flags) throws NameNotFoundException {

        return null;

        try {

            ModuleInfo mi = mPM.getModuleInfo(packageName, flags);

            if (mi != null) {

                return mi;

            }

        } catch (RemoteException e) {

            throw e.rethrowFromSystemServer();

        }



        throw new NameNotFoundException("No module info for package: " + packageName);

    }



    @SuppressWarnings("unchecked")
@@ -3002,7 +3015,6 @@ public class ApplicationPackageManager extends PackageManager { 
        }

    }



    @Override

    public void sendDeviceCustomizationReadyBroadcast() {

        try {

            mPM.sendDeviceCustomizationReadyBroadcast();

core/java/android/content/pm/IPackageManager.aidl

+5 −0
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ import android.content.pm.IOnPermissionsChangeListener; 
import android.content.pm.IntentFilterVerificationInfo;

import android.content.pm.InstrumentationInfo;

import android.content.pm.KeySet;

import android.content.pm.ModuleInfo;

import android.content.pm.PackageInfo;

import android.content.pm.ParceledListSlice;

import android.content.pm.ProviderInfo;
@@ -680,4 +681,8 @@ interface IPackageManager { 
    boolean isPackageStateProtected(String packageName, int userId);



    void sendDeviceCustomizationReadyBroadcast();



    List<ModuleInfo> getInstalledModules(int flags);



    ModuleInfo getModuleInfo(String packageName, int flags);

}

core/java/android/content/pm/ModuleInfo.aidl

0 → 100644
+19 −0
Original line number Diff line number Diff line 
/*

 * Copyright 2018, 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.content.pm;



parcelable ModuleInfo;

core/res/res/values/config.xml

+2 −0
Original line number Diff line number Diff line
@@ -3640,4 +3640,6 @@ 
         (android.view.InputEventCompatProcessor). -->

    <string name="config_inputEventCompatProcessorOverrideClassName" translatable="false"></string>



    <!-- Component name for the default module metadata provider on this device -->

    <string name="config_defaultModuleMetadataProvider">com.android.modulemetadata</string>

</resources>

core/res/res/values/symbols.xml

+2 −0
Original line number Diff line number Diff line
@@ -3519,4 +3519,6 @@ 
  <java-symbol type="dimen" name="rounded_corner_radius" />

  <java-symbol type="dimen" name="rounded_corner_radius_top" />

  <java-symbol type="dimen" name="rounded_corner_radius_bottom" />



  <java-symbol type="string" name="config_defaultModuleMetadataProvider" />

</resources>