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

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

Snap for 4856842 from db3f34c5 to qt-release 

Change-Id: I8fe8f6ad84a10298b8fe953ce8ca9caebb80e286
parents 5663991d db3f34c5

AndroidManifest.xml

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

  coreApp="true"

  package="com.android.dialer"

  android:versionCode="2800000"

  android:versionName="22.0">

  android:versionCode="2900000"

  android:versionName="23.0">



  <uses-sdk

    android:minSdkVersion="24"

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

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

  coreApp="true"

  package="com.google.android.google_stub_dialer"

  android:versionCode="2800000"

  android:versionName="22.0">

  android:versionCode="2900000"

  android:versionName="23.0">



  <uses-sdk

    android:minSdkVersion="24"

java/com/android/dialer/callintent/call_initiation_type.proto

+1 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ message CallInitiationType { 
    DIALPAD = 2;



    SPEED_DIAL = 3;

    SPEED_DIAL_DISAMBIG_DIALOG = 20;



    REMOTE_DIRECTORY = 4;

java/com/android/dialer/calllog/database/AnnotatedCallLogConstraints.java

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

 * Copyright (C) 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 com.android.dialer.calllog.database;



import android.content.ContentValues;

import android.provider.CallLog.Calls;

import android.support.annotation.IntDef;

import com.android.dialer.calllog.database.contract.AnnotatedCallLogContract.AnnotatedCallLog;

import com.android.dialer.common.Assert;

import java.lang.annotation.Retention;

import java.lang.annotation.RetentionPolicy;

import java.util.function.Predicate;



/** Constraints for columns in the {@link AnnotatedCallLog}. */

final class AnnotatedCallLogConstraints {



  /** Type of operation the {@link ContentValues} to be checked is used for. */

  @Retention(RetentionPolicy.SOURCE)

  @IntDef({Operation.INSERT, Operation.UPDATE})

  @interface Operation {

    int INSERT = 1;

    int UPDATE = 2;

  }



  private AnnotatedCallLogConstraints() {}



  /**

   * Checks if the given {@link ContentValues} meets the constraints defined in this class. An

   * {@link IllegalArgumentException} will be thrown if it doesn't.

   */

  public static void check(ContentValues contentValues, @Operation int operationType) {

    checkBooleanColumn(AnnotatedCallLog.IS_READ, contentValues, operationType);

    checkBooleanColumn(AnnotatedCallLog.NEW, contentValues, operationType);

    checkBooleanColumn(AnnotatedCallLog.IS_VOICEMAIL_CALL, contentValues, operationType);

    checkCallTypeColumn(contentValues, operationType);

  }



  /**

   * Checks a boolean column.

   *

   * <p>Constraints: the value must be either 0 or 1 (SQLite database has no boolean type, so the

   * value has to be an integer).

   */

  private static void checkBooleanColumn(

      String columnName, ContentValues contentValues, @Operation int operationType) {

    checkColumn(

        columnName,

        contentValues,

        operationType,

        contentValuesToCheck -> {

          Integer value = contentValuesToCheck.getAsInteger(columnName);

          return value != null && (value == 0 || value == 1);

        });

  }



  /**

   * Checks column {@link AnnotatedCallLog#CALL_TYPE}.

   *

   * <p>Constraints: the value must be one of {@link android.provider.CallLog.Calls#TYPE}.

   */

  private static void checkCallTypeColumn(

      ContentValues contentValues, @Operation int operationType) {

    checkColumn(

        AnnotatedCallLog.CALL_TYPE,

        contentValues,

        operationType,

        contentValuesToCheck -> {

          Integer callType = contentValuesToCheck.getAsInteger(AnnotatedCallLog.CALL_TYPE);

          return callType != null

              && (callType == Calls.INCOMING_TYPE

                  || callType == Calls.OUTGOING_TYPE

                  || callType == Calls.MISSED_TYPE

                  || callType == Calls.VOICEMAIL_TYPE

                  || callType == Calls.REJECTED_TYPE

                  || callType == Calls.BLOCKED_TYPE

                  || callType == Calls.ANSWERED_EXTERNALLY_TYPE);

        });

  }



  private static void checkColumn(

      String columnName,

      ContentValues contentValues,

      @Operation int operationType,

      Predicate<ContentValues> predicate) {

    switch (operationType) {

      case Operation.UPDATE:

        if (!contentValues.containsKey(columnName)) {

          return;

        }

        // fall through

      case Operation.INSERT:

        Assert.checkArgument(

            predicate.test(contentValues),

            "Column %s contains invalid value: %s",

            columnName,

            contentValues.get(columnName));

        return;

      default:

        throw Assert.createUnsupportedOperationFailException(

            String.format("Unsupported operation: %s", operationType));

    }

  }

}

java/com/android/dialer/calllog/database/AnnotatedCallLogContentProvider.java

+5 −2
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ import android.net.Uri; 
import android.os.Build;

import android.support.annotation.NonNull;

import android.support.annotation.Nullable;

import com.android.dialer.calllog.database.AnnotatedCallLogConstraints.Operation;

import com.android.dialer.calllog.database.contract.AnnotatedCallLogContract;

import com.android.dialer.calllog.database.contract.AnnotatedCallLogContract.AnnotatedCallLog;

import com.android.dialer.common.Assert;
@@ -41,8 +42,6 @@ import java.util.Arrays; 
/** {@link ContentProvider} for the annotated call log. */

public class AnnotatedCallLogContentProvider extends ContentProvider {







  private static final int ANNOTATED_CALL_LOG_TABLE_CODE = 1;

  private static final int ANNOTATED_CALL_LOG_TABLE_ID_CODE = 2;

  private static final int ANNOTATED_CALL_LOG_TABLE_DISTINCT_NUMBER_CODE = 3;
@@ -150,6 +149,8 @@ public class AnnotatedCallLogContentProvider extends ContentProvider { 
    // Javadoc states values is not nullable, even though it is annotated as such (a bug)!

    Assert.checkArgument(values != null);



    AnnotatedCallLogConstraints.check(values, Operation.INSERT);



    SQLiteDatabase database = databaseHelper.getWritableDatabase();

    int match = uriMatcher.match(uri);

    switch (match) {
@@ -230,6 +231,8 @@ public class AnnotatedCallLogContentProvider extends ContentProvider { 
    // Javadoc states values is not nullable, even though it is annotated as such (a bug)!

    Assert.checkArgument(values != null);



    AnnotatedCallLogConstraints.check(values, Operation.UPDATE);



    SQLiteDatabase database = databaseHelper.getWritableDatabase();

    int match = uriMatcher.match(uri);

    switch (match) {