diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2017-11-30 01:09:36 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2017-11-30 01:09:36 +0000 |
| commit | b1e7530af2bfa14984525e23be17ac1ac5db6b8d (patch) | |
| tree | f014d4d8bf517691586a84dfa43a37099d12061a /java/com/android/dialer/assisteddialing | |
| parent | 226b01b4fb3a6342dd5acf5531d9c44744eab031 (diff) | |
| parent | aa5a8ad237407a8a3be6947c57a5fbd4d7b61bc2 (diff) | |
Merge changes Id7954667,I22de38dc
* changes:
Bump API ceiling for Assisted Dialing.
Add flag to control default assisted dialing state during precall flow.
Diffstat (limited to 'java/com/android/dialer/assisteddialing')
| -rw-r--r-- | java/com/android/dialer/assisteddialing/ConcreteCreator.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/java/com/android/dialer/assisteddialing/ConcreteCreator.java b/java/com/android/dialer/assisteddialing/ConcreteCreator.java index 1563b3513..8a5661e03 100644 --- a/java/com/android/dialer/assisteddialing/ConcreteCreator.java +++ b/java/com/android/dialer/assisteddialing/ConcreteCreator.java @@ -41,8 +41,9 @@ public final class ConcreteCreator { // Floor set at N due to use of Optional. protected static final int BUILD_CODE_FLOOR = Build.VERSION_CODES.N; - // Ceiling set at O because this feature will ship as part of the framework in P. - @VisibleForTesting public static final int BUILD_CODE_CEILING = Build.VERSION_CODES.O; + // Ceiling set at O_MR1 because this feature will ship as part of the framework in P. + // TODO(erfanian): Switch to public build constant when 27 is available in public master. + @VisibleForTesting public static final int BUILD_CODE_CEILING = 27; /** * Creates a new AssistedDialingMediator |