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

Commit ece81758 authored by android-build-team Robot's avatar android-build-team Robot
Browse files

release-request-d3de000d-8c5a-4c3c-b63e-e989421d7762-for-git_oc-mr1-release-41...

release-request-d3de000d-8c5a-4c3c-b63e-e989421d7762-for-git_oc-mr1-release-4176727 snap-temp-L91200000081901352

Change-Id: I10d0449e9a44c32e8c718383ee6afc9a542e9319
parents 442c9b88 f715de6b
Loading
Loading
Loading
Loading
+37 −33
Original line number Diff line number Diff line
40:10695 Android Annotations Support Library
10770:10695 Android Compat Support Library
21501:10695 Android Core UI Support Library
32235:10691 Android Core Utils Support Library
42961:10695 Android Design Support Library
53694:10695 Android Fragments Support Library
64426:10695 Android Graphics Support Library
75162:10691 Android Media Compat Support Library
85892:10691 Android Transition Support Library
96621:10695 Android Compatibility Library v13
107353:10695 Android Compatibility Library v4
118085:10695 Android Compatibility Library v7
128796:16013 Android SDK
144828:11358 Android Common
156196:4771 Glide
160982:11358 Guava JDK5
172358:12847 jibercsclient
185224:10173 libphonenumber
195416:10699 shortcutbadger
206126:11358 Volley
217495:18982 mime4j
236493:11358 Google Auto
247862:11358 Dagger
259236:11357 Error Prone
270604:11358 J2ObjC
281984:11359 Apache Commons IO
293355:11358 JSR 250
304725:1602 JSR 305
306339:11365 JSR 330
317738:12847 carrierservices
317738:12847 rcsclientlib
330614:11358 material_components
330614:11358 lib
341987:11362 Guava JDK7
10754:11358 Android Common
22147:10695 Android Compat Support Library
32880:10695 Android Compatibility Library v13
43612:10695 Android Compatibility Library v4
54344:10695 Android Compatibility Library v7
65075:10695 Android Core UI Support Library
75809:10691 Android Core Utils Support Library
86535:10695 Android Design Support Library
97276:10695 Android Dynamic Animation Support Library
108009:10695 Android Fragments Support Library
118741:10695 Android Graphics Support Library
129477:10691 Android Media Compat Support Library
140207:10691 Android Transition Support Library
150920:11359 Apache Commons IO
162290:11358 Dagger
173664:11357 Error Prone
185037:11358 Google Auto
196410:11358 Guava JDK5
207783:11362 Guava JDK7
219156:11358 J2ObjC
230526:11358 JSR 250
241896:11365 JSR 330
253297:11358 Material Components for Android
264666:11358 OkHttp
276033:11358 Okio
287402:11358 Volley
298780:12847 carrierservices
311636:10402 gRPC
322058:11358 instrumentation
333434:12847 jibercsclient
346300:10173 libphonenumber
356484:18982 mime4j
375485:10699 shortcutbadger
386200:16013 Android SDK
402232:1096 Animal Sniffer
403338:4771 Glide
408121:1602 JSR 305
+1757 −730

File changed.

Preview size limit exceeded, changes collapsed.

+5 −1
Original line number Diff line number Diff line
@@ -332,7 +332,11 @@ public class CameraComposerFragment extends CallComposerFragment
  /** Updates the state of the buttons and overlays based on the current state of the view */
  private void updateViewState() {
    Assert.isNotNull(cameraView);
    Assert.isNotNull(getContext());
    if (isDetached() || getContext() == null) {
      LogUtil.i(
          "CameraComposerFragment.updateViewState", "Fragment detached, cannot update view state");
      return;
    }

    boolean isCameraAvailable = CameraManager.get().isCameraAvailable();
    boolean uriReadyOrProcessing = cameraUri != null || processingUri;
+12 −10
Original line number Diff line number Diff line
@@ -19,12 +19,13 @@ package com.android.dialer.callintent;
import android.os.Bundle;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import com.android.dialer.common.LogUtil;
import com.android.dialer.protos.ProtoParsers;

/** Parses data for a call extra to get any dialer specific app data. */
public class CallIntentParser {
  static final String EXTRA_CALL_SPECIFIC_APP_DATA_WRAPPER =
      "com.android.dialer.callintent.CALL_SPECIFIC_APP_DATA_WRAPPER";


  @Nullable
  public static CallSpecificAppData getCallSpecificAppData(@Nullable Bundle extras) {
    if (extras == null) {
@@ -35,19 +36,20 @@ public class CallIntentParser {
      return null;
    }

    if (extras.getByteArray(Constants.EXTRA_CALL_SPECIFIC_APP_DATA) == null) {
      LogUtil.i(
          "CallIntentParser.getCallSpecificAppData",
          "unexpected null byte array for call specific app data proto");
      return null;
    }

    return ProtoParsers.getTrusted(
        extras.getBundle(Constants.EXTRA_CALL_SPECIFIC_APP_DATA),
        EXTRA_CALL_SPECIFIC_APP_DATA_WRAPPER,
        CallSpecificAppData.getDefaultInstance());
        extras, Constants.EXTRA_CALL_SPECIFIC_APP_DATA, CallSpecificAppData.getDefaultInstance());
  }

  public static void putCallSpecificAppData(
      @NonNull Bundle extras, @NonNull CallSpecificAppData callSpecificAppData) {
    // We wrap our bundle for consumers that may not have access to ProtoParsers in their class
    // loader. This is necessary to prevent ClassNotFoundException's
    Bundle wrapperBundle = new Bundle();
    ProtoParsers.put(wrapperBundle, EXTRA_CALL_SPECIFIC_APP_DATA_WRAPPER, callSpecificAppData);
    extras.putBundle(Constants.EXTRA_CALL_SPECIFIC_APP_DATA, wrapperBundle);
    ProtoParsers.put(extras, Constants.EXTRA_CALL_SPECIFIC_APP_DATA, callSpecificAppData);
  }

  private CallIntentParser() {}
+5 −0
Original line number Diff line number Diff line
@@ -26,4 +26,9 @@ public class TrafficStatsTags {
  public static final int REVERSE_GEOCODE_TAG = 0xd001;
  public static final int VISUAL_VOICEMAIL_TAG = 0xd002;
  public static final int DIALER_VOIP_TAG = 0xd003;

  // 0xFFFFFE00 to 0xFFFFFF00 reserved for proprietary extensions to the dialer app.

  // 0xFFFFFF00 to 0xFFFFFFFF reserved by the system (see TrafficStats#getAndSetThreadStatsTag)

}
Loading