From 1bed93742fc06ee285dcce0af926336f7f484d9e Mon Sep 17 00:00:00 2001
From: Chad Brubaker <cbrubaker@google.com>
Date: Mon, 20 Mar 2017 10:52:52 -0700
Subject: [PATCH] Expose Android ID to Instant Apps

Android ID in O is scoped per-app but persistent across
installs. Since Instant Apps can use the cookie to implement similar
functionality its fine to expose.

In a follow up the Android ID generation will be made to depend on the
cookie so that clearing the cookie also breaks the persistence.

Bug: 36385889
Test: Manual
Change-Id: I09b993bb4153179b80eebe0da8dac3fad7b9c779
---
 core/java/android/provider/Settings.java | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java
index 7b84f68939825..f0056c23259cc 100755
--- a/core/java/android/provider/Settings.java
+++ b/core/java/android/provider/Settings.java
@@ -7077,6 +7077,8 @@ public final class Settings {
 
             INSTANT_APP_SETTINGS.add(DEFAULT_INPUT_METHOD);
             INSTANT_APP_SETTINGS.add(ENABLED_INPUT_METHODS);
+
+            INSTANT_APP_SETTINGS.add(ANDROID_ID);
         }
 
         /**