From 2efeeccad25111612f9f72dce07010d7aed7d90f Mon Sep 17 00:00:00 2001
From: Zimuzo <zezeozue@google.com>
Date: Fri, 2 Nov 2018 17:47:13 +0000
Subject: [PATCH] Fix location split-permission targetSdk

Ia5b3f47b73c9feea924373268a4eee142f555091 introduced a bug where the targetSdk for android.permission.ACCESS_FINE_LOCATION and android.permission.ACCESS_COARSE_LOCATION was set to 28 instead of Q (10000).

Test: CtsAppThatRequestsLocationPermission28.apk requests android.permission.ACCESS_COARSE_LOCATION and android.permission.ACCESS_BACKGROUND_LOCATION
Bug: 118882117
Bug: 111411340
Change-Id: I532379aa2c8a173a516d38e1c8568cff5dbaed33
---
 data/etc/platform.xml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/data/etc/platform.xml b/data/etc/platform.xml
index 499ad386d0589..68f24fb7b6610 100644
--- a/data/etc/platform.xml
+++ b/data/etc/platform.xml
@@ -189,12 +189,14 @@
                       targetSdk="16">
         <new-permission name="android.permission.WRITE_CALL_LOG" />
     </split-permission>
+    <!-- STOPSHIP(b/118882117): change targetSdk to Q when SDK version finalised -->
     <split-permission name="android.permission.ACCESS_FINE_LOCATION"
-                      targetSdk="28">
+                      targetSdk="10000">
         <new-permission name="android.permission.ACCESS_BACKGROUND_LOCATION" />
     </split-permission>
+    <!-- STOPSHIP(b/118882117): change targetSdk to Q when SDK version finalised -->
     <split-permission name="android.permission.ACCESS_COARSE_LOCATION"
-                      targetSdk="28">
+                      targetSdk="10000">
         <new-permission name="android.permission.ACCESS_BACKGROUND_LOCATION" />
     </split-permission>