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

Commit edd4ed59 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge changes Ida17f8e2,I7604d745 

* changes:
  internal change
  Bump version codes of v18
parents bb6a02d2 a6e7ff6c

AndroidManifest.xml

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 
<manifest xmlns:android="http://schemas.android.com/apk/res/android"

  coreApp="true"

  package="com.android.dialer"

  android:versionCode="230000"

  android:versionCode="240000"

  android:versionName="18.0">



  <uses-sdk

java/com/android/dialer/binary/google/AndroidManifest.xml

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 
<manifest xmlns:android="http://schemas.android.com/apk/res/android"

  coreApp="true"

  package="com.google.android.google_stub_dialer"

  android:versionCode="230000"

  android:versionCode="240000"

  android:versionName="18.0">



  <uses-sdk

java/com/android/dialer/feedback/FeedbackComponent.java

+3 −0
Original line number Diff line number Diff line
@@ -28,6 +28,9 @@ public abstract class FeedbackComponent { 
  @NonNull

  public abstract CallList.Listener getCallFeedbackListener();



  @NonNull

  public abstract FeedbackSender getCallFeedbackSender();



  public static FeedbackComponent get(Context context) {

    return ((HasComponent) ((HasRootComponent) context.getApplicationContext()).component())

        .feedbackComponent();

java/com/android/dialer/feedback/FeedbackSender.java

0 → 100644
+24 −0
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 com.android.dialer.feedback;



/** Defines the apis provided by the class handling uploading of feedback. */

public interface FeedbackSender {

  void sendFeedback(Object feedbackOptions);



  Object getFeedbackOptionsBuilder();

}

java/com/android/dialer/feedback/stub/FeedbackSenderStub.java

0 → 100644
+35 −0
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 com.android.dialer.feedback.stub;



import com.android.dialer.feedback.FeedbackSender;

import javax.inject.Inject;



/** Stub module that is returned if the Feedback module is not enabled. */

public class FeedbackSenderStub implements FeedbackSender {



  @Inject

  public FeedbackSenderStub() {}



  @Override

  public void sendFeedback(Object feedbackOptions) {}



  @Override

  public Object getFeedbackOptionsBuilder() {

    return null;

  }

}