commit cf6206f9112eeb618d3c57a034db23401e2b87e0
author Haibo Huang <hhb@google.com> Mon Jun 03 13:00:39 2019 -0700
committer Haibo Huang <hhb@google.com> Thu Jun 06 18:00:31 2019 +0000
tree 4504838308ac8edb3c0d3856336eac8910f55f7b
parent 698b3567931d65562bcd93320d5a377c784c4db6

Fix compilation error with new kotlinc

These code failed with kotlinc v1.3.31. The new compiler is able to
understand Java @NotNull.

Test: build
Change-Id: Ief63183f08282cdcfee21c300a537a5ae9545266
Merged-In: I4df49514008588ec16698f1f5ca11bca151a12a9

tests/tests/appop/src/android/app/appops/cts/AppOpsTest.kt

diff --git a/tests/tests/appop/src/android/app/appops/cts/AppOpsTest.kt b/tests/tests/appop/src/android/app/appops/cts/AppOpsTest.kt
index e5fe926..c358913 100644
--- a/tests/tests/appop/src/android/app/appops/cts/AppOpsTest.kt
+++ b/tests/tests/appop/src/android/app/appops/cts/AppOpsTest.kt
@@ -313,11 +313,11 @@
     @Test
     fun testPermissionMapping() {
         for (entry in permissionToOpStr) {
-            testPermissionMapping(entry.key, permissionToOpStr[entry.key])
+            testPermissionMapping(entry.key, entry.value)
         }
     }
 
-    private fun testPermissionMapping(permission: String, opStr: String?) {
+    private fun testPermissionMapping(permission: String, opStr: String) {
         // Do the public value => internal op code lookups.
         val mappedOpStr = AppOpsManager.permissionToOp(permission)
         assertEquals(mappedOpStr, opStr)

tests/tests/appop/src/android/app/appops/cts/HistoricalAppopsTest.kt

diff --git a/tests/tests/appop/src/android/app/appops/cts/HistoricalAppopsTest.kt b/tests/tests/appop/src/android/app/appops/cts/HistoricalAppopsTest.kt
index 2769f36..6cbdca3 100644
--- a/tests/tests/appop/src/android/app/appops/cts/HistoricalAppopsTest.kt
+++ b/tests/tests/appop/src/android/app/appops/cts/HistoricalAppopsTest.kt
@@ -240,7 +240,7 @@
             // Note ops such that we have data at all levels
             for (d in depth downTo 0) {
                 for (i in 0 until noteCount) {
-                    appOpsManager!!.noteOp(AppOpsManager.OPSTR_START_FOREGROUND, uid, packageName)
+                    appOpsManager!!.noteOp(AppOpsManager.OPSTR_START_FOREGROUND, uid, packageName!!)
                 }
 
                 if (d > 0) {
@@ -341,17 +341,17 @@
         val chunk = HistoricalOps(SNAPSHOT_INTERVAL_MILLIS / 4,
                 SNAPSHOT_INTERVAL_MILLIS / 2)
         chunk.increaseAccessCount(AppOpsManager.OP_START_FOREGROUND, uid,
-                packageName, AppOpsManager.UID_STATE_TOP, AppOpsManager.OP_FLAG_SELF, 10)
+                packageName!!, AppOpsManager.UID_STATE_TOP, AppOpsManager.OP_FLAG_SELF, 10)
         chunk.increaseAccessCount(AppOpsManager.OP_START_FOREGROUND, uid,
-                packageName, AppOpsManager.UID_STATE_BACKGROUND, AppOpsManager.OP_FLAG_SELF, 10)
+                packageName!!, AppOpsManager.UID_STATE_BACKGROUND, AppOpsManager.OP_FLAG_SELF, 10)
         chunk.increaseRejectCount(AppOpsManager.OP_START_FOREGROUND, uid,
-                packageName, AppOpsManager.UID_STATE_TOP, AppOpsManager.OP_FLAG_SELF, 10)
+                packageName!!, AppOpsManager.UID_STATE_TOP, AppOpsManager.OP_FLAG_SELF, 10)
         chunk.increaseRejectCount(AppOpsManager.OP_START_FOREGROUND, uid,
-                packageName, AppOpsManager.UID_STATE_BACKGROUND, AppOpsManager.OP_FLAG_SELF, 10)
+                packageName!!, AppOpsManager.UID_STATE_BACKGROUND, AppOpsManager.OP_FLAG_SELF, 10)
         chunk.increaseAccessDuration(AppOpsManager.OP_START_FOREGROUND, uid,
-                packageName, AppOpsManager.UID_STATE_TOP, AppOpsManager.OP_FLAG_SELF, 10)
+                packageName!!, AppOpsManager.UID_STATE_TOP, AppOpsManager.OP_FLAG_SELF, 10)
         chunk.increaseAccessDuration(AppOpsManager.OP_START_FOREGROUND, uid,
-                packageName, AppOpsManager.UID_STATE_BACKGROUND, AppOpsManager.OP_FLAG_SELF, 10)
+                packageName!!, AppOpsManager.UID_STATE_BACKGROUND, AppOpsManager.OP_FLAG_SELF, 10)
         return chunk
     }