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

Commit 5a967c3f authored by Max Tauro's avatar Max Tauro Committed by Automerger Merge Worker
Browse files

Merge "CarSystemUIModule/CarSystemUIRootComponent public" into rvc-dev am:... 

Merge "CarSystemUIModule/CarSystemUIRootComponent public" into rvc-dev am: 51a5c0c3 am: aa3dc3d9

Change-Id: I6f17673efef53c9c257ea65cfb97eb4b6e760ac2
parents 4cfaf53d aa3dc3d9

packages/CarSystemUI/src/com/android/systemui/CarComponentBinder.java

+1 −2
Original line number Diff line number Diff line
@@ -28,7 +28,6 @@ import dagger.Module; 
@Module(includes = {

        DefaultActivityBinder.class,

        DefaultBroadcastReceiverBinder.class,

        DefaultServiceBinder.class,

        CarSystemUIBinder.class})

        DefaultServiceBinder.class})

public class CarComponentBinder {

}

packages/CarSystemUI/src/com/android/systemui/CarSystemUIModule.java

+1 −1
Original line number Diff line number Diff line
@@ -65,7 +65,7 @@ import dagger.Module; 
import dagger.Provides;



@Module(includes = {DividerModule.class})

abstract class CarSystemUIModule {

public abstract class CarSystemUIModule {



    @Singleton

    @Provides

packages/CarSystemUI/src/com/android/systemui/CarSystemUIRootComponent.java

+1 −1
Original line number Diff line number Diff line
@@ -40,6 +40,6 @@ import dagger.Component; 
                CarSystemUIModule.class,

                CarSystemUIBinder.class

        })

interface CarSystemUIRootComponent extends SystemUIRootComponent {

public interface CarSystemUIRootComponent extends SystemUIRootComponent {



}